Your IP : 216.73.216.91

Current Path : /usr/lib/beyondcompare/help/
Upload File :
Current File : //usr/lib/beyondcompare/help/viewtextmerge.html

<!DOCTYPE html>
<html>
<head>
   <title>Text Merge Overview</title>
   <meta name="generator" content="Help &amp; Manual" />
   <meta name="keywords" content="3-way merge,3-way merge session,merge,merge session,sessions,sessions Text Merge,Text Merge,Text Merge about" />
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <link type="text/css" href="default.css" rel="stylesheet" />
   <script type="text/javascript" src="jquery.js"></script>
   <script type="text/javascript" src="helpman_settings.js"></script>
   <script type="text/javascript" src="helpman_topicinit.js"></script>

   <script type="text/javascript">
     HMSyncTOC("index.html", "viewtextmerge.html");
   </script>
   <script type="text/javascript" src="highlight.js"></script>
   <script type="text/javascript">
     $(document).ready(function(){highlight();});
   </script>
</head>
<body style="margin: 0px 0px 0px 0px; background: #FFFFFF;">


<table width="100%" border="0" cellspacing="0" cellpadding="5" 
       style="margin: 0px; background: #9D0909 url(red-bg.jpg) 0px 0px repeat-x;">
<!-- <table width="100%" border="0" cellspacing="0" cellpadding="5" bgcolor="#B01213"> -->
  <tr valign="middle">
<!--    <td style="width: 10px">&nbsp;</td> -->
    <td align="left">
      <h1 class="p_Heading1"><span class="f_Heading1">Text Merge Overview</span></h1>

    </td>
    <td align="right">
     <span style="font-size: 9pt">
     <a href="searching_for_text.html"
        onmouseover="document.images.prev.src='prev-hot.png'" 
        onmouseout="document.images.prev.src='prev.png'"
        ><img name=prev src="prev.png" border=0 alt="Previous"
        ></a><a href="using_bc.html"
        onmouseover="document.images.top.src='top-hot.png'" 
        onmouseout="document.images.top.src='top.png'"><img name=top src="top.png" border=0 alt="Up"
        ></a><a href="using_text_merge.html"
        onmouseover="document.images.next.src='next-hot.png'" 
        onmouseout="document.images.next.src='next.png'"><img name=next src="next.png" border=0 alt="Next"
        ></a>
     </span>
    </td>
  </tr>
</table>


<!-- Placeholder for topic body. -->
<table width="100%" border="0" cellspacing="0" cellpadding="5"><tr valign="top"><td align="left">
<p class="p_Normal"><img width="27" height="12" style="margin:0;width:27px;height:12px;border:none" src="pro.png"/></p>
<p class="p_Normal">A Text Merge session contains two or three non-editable source panes and an editable output pane.  The left and right panes hold two versions of a file.  Beyond Compare helps you combine changes from both versions into the output pane.  The optional center pane holds an older version of the file, a common ancestor of the left and right versions.</p>
<p class="p_Normal"><a href="viewtextmerge.jpg"><img id="TOGGLE0186A1" class="image-toggle" alt="Click to zoom" title="Click to zoom" style="margin:0;width:197px;height:146px;border:none" src="viewtextmerge_zoom33.jpg"/></a></p>
<p class="p_Normal">You can temporarily hide the <span class="f_Command">Center Pane</span> <img width="16" height="16" style="margin:0;width:16px;height:16px;border:none" src="showcenter.png"/> to give the left and right panes more room.  You can also use the <span class="f_Command">Detached Output Pane</span> <img width="16" height="16" style="margin:0;width:16px;height:16px;border:none" src="outputwindow.png"/> to move the output into a separate window.  If you have a second monitor, you can then move this window onto it.</p>
<p class="p_Normal">The output content is constructed automatically as the comparison loads.  You can manually edit the output, or use the <span class="f_Command">Take</span> commands to pull text from a specific source file, overriding the default merge.</p>
<p class="p_Normal">It is important to note that any prior copy of the output file is ignored.  If it existed before the merge session, or was changed during the session, the existing content will be lost if you save the merge session output.</p>
<p class="p_SingleSpaced"><span class="f_SeeAlso">See also</span></p>
<p class="p_SingleSpaced"><a href="3-way_merge_concepts.html" class="topiclink">3-way Merge Concepts</a></p>
<p class="p_SingleSpaced"><a href="commandstextmerge.html" class="topiclink">Text Merge Commands</a></p>
<p class="p_SingleSpaced"><a href="sessiontextmerge.html" class="topiclink">Text Merge Settings</a></p>
<p class="p_SingleSpaced"><a href="formattext.html" class="topiclink">Text Format Settings</a></p>
<p class="p_SingleSpaced"><a href="optionstext.html" class="topiclink">Text Editing Options</a></p>

</td></tr></table>

<script type="text/javascript">
HMInitToggle('TOGGLE0186A1','hm.type','picture','hm.state','0','hm.src0','viewtextmerge_zoom33.jpg','hm.src1','viewtextmerge.jpg','hm.title0','Click to zoom','hm.title1','Click to zoom');
</script>
</body>
</html>