mirror of
https://github.com/opnsense/src.git
synced 2026-02-20 00:11:07 -05: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
26 lines
1.1 KiB
Text
26 lines
1.1 KiB
Text
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
|
|
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, best change 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
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|
|
This line is deleted in yours
|
|
These lines are the same in all three files
|
|
These lines are the same in all three files
|