/usr/share/doc/subcommander/html/ch03s02.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 | <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Diff</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="ch03s01.html" title="Overview"><link rel="next" href="ch03s03.html" title="Merge"></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">Diff</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s01.html">Prev</a> </td><th width="60%" align="center">Chapter 3. submerge</th><td width="20%" align="right"> <a accesskey="n" href="ch03s03.html">Next</a></td></tr></table><hr></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="idp60620880"></a>Diff</h2></div></div></div><p>Figure <a class="xref" href="ch03s02.html#sm_pic_Diff" title="Figure 3.2. submerge Diff">Figure 3.2, “submerge Diff”</a> shows a typical diff in
submerge. The lines in the left and the right file that differ are drawn
with a red background. In the middle between the left and the right file
you see the <span class="bold"><strong>Difference Marker</strong></span>. Each
difference between the two files is counted starting with 1. The
difference number is the number between the lines of the Difference
Marker. Those two lines mark the lines from the left and the right file
that represent that difference.</p><div class="figure"><a name="sm_pic_Diff"></a><p class="title"><b>Figure 3.2. submerge Diff</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="images/Submerge-Diff.png" align="middle" alt="submerge Diff"></div></div></div><br class="figure-break"><p>You can jump with the <span class="bold"><strong>Next/Previous
Difference</strong></span> buttons in the tool bar between the differences of
the two files. The <span class="bold"><strong>Current Difference</strong></span> is
highlighted in black. You can also use the wheel of your mouse to jump to
the next or previous difference.</p><p>In the status bar you can see the <span class="bold"><strong>Difference
Count</strong></span>. That is the number of differences of the two input
files.</p><p>The <span class="bold"><strong>Merge</strong></span> button is used to merge
the two input file. Merging is explained in the next section.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s01.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="ch03s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Overview </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Merge</td></tr></table></div></body></html>
|