mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
b37a6938e3
In gnu diff3 3 way merging files where the new file and the target are already the same will die and show what has failed to be merged except if -E is passed in argument, in this case it will finish the merge. This difference in behaviour was breaking one of the etcupdate testcase with bsd diff3 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41730 |
||
---|---|---|
.. | ||
1.out | ||
1.txt | ||
1cr.txt | ||
1t.out | ||
2.out | ||
2.txt | ||
3.out | ||
3.txt | ||
4.out | ||
5.out | ||
6.out | ||
7.out | ||
8.out | ||
9.out | ||
diff3_test.sh | ||
fbsdid1.txt | ||
fbsdid2.txt | ||
long-A.out | ||
long-ed.out | ||
long-m.txt | ||
long-merge.out | ||
long-o.txt | ||
long-y.txt | ||
Makefile | ||
Makefile.depend |