Baptiste Daroussin b37a6938e3 diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3 ... 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		2023-09-06 17:06:39 +02:00
..
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	diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3	2023-09-06 17:06:39 +02:00
fbsdid1.txt	diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3	2023-09-06 17:06:39 +02:00
fbsdid2.txt	diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3	2023-09-06 17:06:39 +02:00
long-A.out	diff3: Add support for -A	2022-04-19 15:54:32 +01:00
long-ed.out	diff3: allow diff3 ed scripts to generate deletions	2022-04-15 15:00:59 +01:00
long-m.txt	diff3: allow diff3 ed scripts to generate deletions	2022-04-15 15:00:59 +01:00
long-merge.out	diff3: Add support for -m	2022-04-19 16:20:24 +01:00
long-o.txt	diff3: allow diff3 ed scripts to generate deletions	2022-04-15 15:00:59 +01:00
long-y.txt	diff3: allow diff3 ed scripts to generate deletions	2022-04-15 15:00:59 +01:00
Makefile	diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3	2023-09-06 17:06:39 +02:00
Makefile.depend	Remove $FreeBSD$: one-line sh pattern	2023-08-16 11:55:03 -06:00