/usr/share/doc/subcommander/html/ch03s01.html is in subcommander-doc 2.0.0~b5p2-5.1.
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 | <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Overview</title><meta name="generator" content="DocBook XSL Stylesheets V1.78.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="ch03.html" title="Chapter 3. submerge"><link rel="next" href="ch03s02.html" title="Diff"></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">Overview</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03.html">Prev</a> </td><th width="60%" align="center">Chapter 3. submerge</th><td width="20%" align="right"> <a accesskey="n" href="ch03s02.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp60746448"></a>Overview</h2></div></div></div><p>The screen shot below (<a class="xref" href="ch03s01.html#sm_pic_MainWindowOverview" title="Figure 3.1. submerge Main Window">Figure 3.1, “submerge Main Window”</a>)
shows submerges main window with all views visible. Normally you will not
see them all at once.</p><p>The <span class="bold"><strong>Original File</strong></span> View on the left
is only used in a <span class="emphasis"><em>three way merge</em></span> and even then it is
hidden by default. You can unhide or hide it by using the <span class="bold"><strong>Click Splitter</strong></span> widget on the left. In the usual
diff case the Original File is unavailable and there is no Click Splitter
widget.</p><p>The <span class="bold"><strong>Left File</strong></span> View and the
<span class="bold"><strong>Right File</strong></span> View display the typical diff
between two files and are usually both visible. You can temporarily hide
or unhide the left or right file with the <span class="bold"><strong>Hide/Unhide Left</strong></span> or <span class="bold"><strong>Hide/Unhide Right</strong></span> check boxes. This is usefull to
view more of the files content without scrolling.</p><div class="figure"><a name="sm_pic_MainWindowOverview"></a><p class="title"><b>Figure 3.1. submerge Main Window</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Submerge-MainWindow-Overview.png" align="middle" alt="submerge Main Window"></div></div></div><br class="figure-break"><p>With <span class="bold"><strong>Hide/Unhide Line Diff</strong></span> you show
or hide the <span class="bold"><strong>Line Diff</strong></span> View below Left
File and Right File. The Line Diff View is used to locate the differences
between nearly identical lines of the Left File and the Right File. If the
Line Diff View is enabled you can show a lines left and right content in
vertical order by right clicking that line. The left line is displayed in
the top line and the right line in the bottom line of the Line Diff View.
You can now easily spot the difference between the two lines even if they
only differ in a single character. Since it is usually not needed it is
hidden by default.</p><p>At the bottom is the <span class="bold"><strong>Merge Editor</strong></span>
which shows the merged version of the left and right file while merging
them. You can hide and unhide it with the bottom <span class="bold"><strong>Click Splitter</strong></span> widget.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03.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="ch03s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 3. submerge </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Diff</td></tr></table></div></body></html>
|