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
..
tests	diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3	2023-09-06 17:06:39 +02:00
diff3.1	Remove $FreeBSD$: one-line nroff pattern	2023-08-16 11:55:15 -06:00
diff3.c	diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3	2023-09-06 17:06:39 +02:00
Makefile	Remove $FreeBSD$: one-line sh pattern	2023-08-16 11:55:03 -06:00