e60
Detailed Description of diff3 Normal Format
Normally, two spaces precede each copy of an input line to distinguish it from
the commands. But with the '
See
Commands take the following forms.
'
'
If the last line in a set of input lines is incomplete (see
This hunk appears after line l of file, file, and contains no lines in that file. To edit this file to yield the other
files, one must append hunk lines taken from the other files. For example, '1:11a' means that the hunk follows line 11 in the first file and contains no lines
from that file.
This hunk contains the lines in the range r of file file. The range r is a
comma-separated pair of line numbers, or just one number if the range is a
singleton. To edit this file to yield the other files, one must change the specified
lines to be the lines taken from the other files. For example, '2:11,13c' means that the hunk contains lines 11 through 13 from the second file.