mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 21:05:08 +00:00
7c03df6855
diff3 with the -e (ed script flag) can generate line deletions, add support for deletions and add a test case to exercise this behaviour. This functionality was unearthed through comparison of bsd diff3 and gnu diff3 output. Reviewed by: pstef Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D34912
27 lines
1.1 KiB
Plaintext
27 lines
1.1 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
|
|
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
|
|
This line is different in yours and mine, the same is in both
|
|
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
|
|
This line is different in yours and mine, but the best in yours
|
|
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
|
|
This line is deleted in mine
|
|
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
|