opnsense-src/usr.bin/diff3/tests
Baptiste Daroussin 1449573b44 diff3: add 3 missing files from the testsuite
Fixes:	2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b
(cherry picked from commit 284a0aa96eb63f12831a9e06514a50b2cd80957f)
2026-03-22 02:04:58 +00: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
conflict-Em.out diff3: add 3 missing files from the testsuite 2026-03-22 02:04:58 +00:00
conflict-merge.out diff3: add 3 missing files from the testsuite 2026-03-22 02:04:58 +00:00
conflict1.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
conflict2.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
conflict3.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
diff3_test.sh diff3: fix merge mode 2026-03-22 02:04:58 +00:00
fbsdid1.txt
fbsdid2.txt
long-A.out
long-ed.out
long-m.txt
long-merge.out
long-o.txt
long-y.txt
Makefile diff3: fix merge mode 2026-03-22 02:04:58 +00:00
Makefile.depend
passwd-Em.out diff3: fix merge mode 2026-03-22 02:04:58 +00:00
passwd-new.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
passwd-old.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
passwd-test.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
simple-Em.out diff3: fix merge mode 2026-03-22 02:04:58 +00:00
simple-merge.out diff3: fix merge mode 2026-03-22 02:04:58 +00:00
simple1.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
simple2.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00
simple3.txt diff3: fix merge mode 2026-03-22 02:04:58 +00:00