mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 21:05:08 +00:00
9ab079c5e8
Diff3 in -A mode generates an ed script to show how the 3 files and brackets changes that conflict. The ed script generated should when applied leave familiar merge conflict markers in a patched file. Diff3 output is not documented, this feature has been arrived at by comparing bsd diff3 output to gnu diff3 output until they were made to agree. There are likely to still be differences between these formats. The gnu diff3 guide is actually quite good at explaining how diff3 output should appear, but it doesn't cover every form of output from diff3. https://www.gnu.org/software/diffutils/manual/diffutils.html#Comparing-Three-Files Discussed with: pstef, kevans Sponsored by: Klara, Inc.
23 lines
376 B
Plaintext
23 lines
376 B
Plaintext
24d
|
|
16a
|
|
||||||| long-o.txt
|
|
This line is different in yours and mine, but the different in each
|
|
=======
|
|
This line is different in yours and mine, but the best in yours
|
|
>>>>>>> long-y.txt
|
|
.
|
|
15a
|
|
<<<<<<< long-m.txt
|
|
.
|
|
11a
|
|
>>>>>>> long-y.txt
|
|
.
|
|
10a
|
|
<<<<<<< long-o.txt
|
|
This line is different in yours and mine, but the same
|
|
=======
|
|
.
|
|
8c
|
|
This line is different in yours, much butter
|
|
.
|