/usr/share/doc/subcommander/html/ch03s03.html is in subcommander-doc 2.0.0~b5p2-6.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Merge</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><link rel="home" href="index.html" title="The Subcommander Guide"><link rel="up" href="ch03.html" title="Chapter 3. submerge"><link rel="prev" href="ch03s02.html" title="Diff"><link rel="next" href="apa.html" title="Appendix A. Miscellaneous"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Merge</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s02.html">Prev</a> </td><th width="60%" align="center">Chapter 3. submerge</th><td width="20%" align="right"> <a accesskey="n" href="apa.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="sec_submerge_merge"></a>Merge</h2></div></div></div><p>You can merge with two input files file (<span class="emphasis"><em>two way
merge</em></span>) or with three input files (<span class="emphasis"><em>three way
merge</em></span>). Press the <span class="bold"><strong>merge</strong></span> tool
bar button to open the <span class="bold"><strong>Merge Editor</strong></span>. In
the Merge Editor you see the current content of the merged file.</p><p>In case of a two way merge the merged file initially is the same as
the left file. It has the same lines marked with a red background as the
left file.</p><div class="figure"><a name="sm_pic_Merge"></a><p class="title"><b>Figure 3.3. submerge Merge</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Submerge-Merge.png" align="middle" alt="submerge Merge"></div></div></div><br class="figure-break"><p>To select a difference from the left or right file as content for
the merged file simply double click the difference in the source file. In
the Merge Editor the content changes to the selected difference and the
difference gets a blue background. The blue background indicates that you
have resolved the conflict for this difference in the left and right file.
The left or right line marker of the <span class="bold"><strong>Difference
Marker</strong></span> turns to blue as well, depending on which file (left or
right) you choose.</p><p>You can also edit the merged file in the Merge Editor. Double
clicking a difference block in the Merge Editor does scroll the source
files to the same difference and does make it the current difference. With
the mouse wheel you can scroll to the next or the previous
difference.</p><p>In case of a three way merge you may have a green background for a
difference. The green background says that the lines are <span class="bold"><strong>Identical to the Original file</strong></span>. Take a look at
difference 3 in the screen shot. The left and right file are different and
the left file is identical to the original file.</p><p>If one difference in a file is identical to the original file
submerge does automatically select the difference lines from the other
file for the merged file.</p><p>Selecting <span class="bold"><strong>Save</strong></span> from the File menu
will save the merged file under the name of the left file.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch03.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="apa.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Diff </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix A. Miscellaneous</td></tr></table></div></body></html>
|