034dd2d54f
diff3 in -m mode generates a complete file with changes bracketed with conflict markers. This adds support for diff3 to generate version control style three way merge output. The output format was inferred from looking at the gnu diff3 output on a selection of test files as a specification of what diff3 -m should output is not available. It is likely there are cases where the -m output differs from other tools and I am happy to update diff3 to address these. Discussed with: pstef, kevans Sponsored by: Klara, Inc.
36 lines
1.4 KiB
Plaintext
36 lines
1.4 KiB
Plaintext
This is a long file
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
This line is different in mine, not better
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
This line is different in yours, much butter
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
<<<<<<< long-o.txt
|
|
This line is different in yours and mine, but the same
|
|
=======
|
|
This line is different in yours and mine, the same is in both
|
|
>>>>>>> long-y.txt
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
<<<<<<< long-m.txt
|
|
This line is different in yours and mine, best change in mine
|
|
||||||| 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
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|