HomeFreeBSD
Diffusion FreeBSD src repository 2cfca8e710f2

diff3: fix merge mode
2cfca8e710f2
Actions

Description

diff3: fix merge mode

Make the merge mode compatible with GNU diff3
Add tests for all the changes, those tests are extracted from the
etcupdate testsuite.

This version passes the etcupdate testsuite and the diffutils diff3
test suite.

MFC After: 1 week

Details

Provenance
baptAuthored on Feb 13 2026, 4:10 PM
Parents
rGa8b8feced998: atf_python/vnet: Make it possible to set the FIB of vnet interfaces
Branches
Unknown
Tags
Unknown

Changes (15)

PathSize
usr.bin/
diff3/
tests/

rG2cfca8e710f2

View Options

usr.bin/diff3/diff3.c

Loading...
View Options

usr.bin/diff3/tests/Makefile

Loading...
View Options

usr.bin/diff3/tests/conflict1.txt

Loading...
View Options

usr.bin/diff3/tests/conflict2.txt

Loading...
View Options

usr.bin/diff3/tests/conflict3.txt

Loading...
View Options

usr.bin/diff3/tests/diff3_test.sh

Loading...
View Options

usr.bin/diff3/tests/passwd-Em.out

Loading...
View Options

usr.bin/diff3/tests/passwd-new.txt

Loading...
View Options

usr.bin/diff3/tests/passwd-old.txt

Loading...
View Options

usr.bin/diff3/tests/passwd-test.txt

Loading...
View Options

usr.bin/diff3/tests/simple-Em.out

Loading...
View Options

usr.bin/diff3/tests/simple-merge.out

Loading...
View Options

usr.bin/diff3/tests/simple1.txt

Loading...
View Options

usr.bin/diff3/tests/simple2.txt

Loading...
View Options

usr.bin/diff3/tests/simple3.txt

Loading...