Baptiste Daroussin 284a0aa96e diff3: add 3 missing files from the testsuite ...

Fixes:	2cfca8e710

2026-02-13 20:26:02 +01: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

…

conflict1.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

conflict2.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

conflict3.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

conflict-Em.out

diff3: add 3 missing files from the testsuite

2026-02-13 20:26:02 +01:00

conflict-merge.out

diff3: add 3 missing files from the testsuite

2026-02-13 20:26:02 +01:00

diff3_test.sh

diff3: fix merge mode

2026-02-13 18:36:42 +01: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: fix merge mode

2026-02-13 18:36:42 +01:00

Makefile.depend

Remove $FreeBSD$: one-line sh pattern

2023-08-16 11:55:03 -06:00

passwd-Em.out

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

passwd-new.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

passwd-old.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

passwd-test.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

simple1.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

simple2.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

simple3.txt

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

simple-Em.out

diff3: fix merge mode

2026-02-13 18:36:42 +01:00

simple-merge.out

diff3: fix merge mode

2026-02-13 18:36:42 +01:00