mirror of
https://github.com/opnsense/src.git
synced 2026-06-05 06:42:56 -04: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
29 lines
332 B
Makefile
29 lines
332 B
Makefile
|
|
PACKAGE= tests
|
|
|
|
ATF_TESTS_SH= diff3_test
|
|
${PACKAGE}FILES+= \
|
|
1.txt \
|
|
1cr.txt \
|
|
2.txt \
|
|
3.txt \
|
|
long-m.txt \
|
|
long-o.txt \
|
|
long-y.txt \
|
|
1.out \
|
|
1t.out \
|
|
2.out \
|
|
3.out \
|
|
4.out \
|
|
5.out \
|
|
6.out \
|
|
7.out \
|
|
8.out \
|
|
9.out \
|
|
long-ed.out \
|
|
long-A.out \
|
|
long-merge.out \
|
|
fbsdid1.txt \
|
|
fbsdid2.txt
|
|
|
|
.include <bsd.test.mk>
|