| Comparing and Merging Files with GNU diff and patch by David MacKenzie, Paul Eggert, and Richard Stallman Paperback (6"x9"), 120 pages ISBN 0954161750 RRP £12.95 ($19.95) "Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004) Get a printed copy>>> |
8.4 How diff3 Merges Incomplete Lines
With -m, incomplete lines (see section 3 Incomplete Lines) are simply
copied to the output as they are found; if the merged output ends in an
conflict and one of the input files ends in an incomplete
line, succeeding ‘|||||||’, ‘=======’ or ‘>>>>>>>’
brackets appear somewhere other than the start of a line because
they are appended to the incomplete line.
Without -m, if an ed script option is specified and an
incomplete line is found, diff3 generates a warning and acts as
if a newline had been present.
| ISBN 0954161750 | Comparing and Merging Files with GNU diff and patch | See the print edition |