Diffusion FreeBSD src repository 284a0aa96eb6

diff3: add 3 missing files from the testsuite
284a0aa96eb6
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

diff3: add 3 missing files from the testsuite

Fixes: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b

Details

Provenance

bapt	Authored on Feb 13 2026, 5:45 PM

Parents

rG06d07d4af1c9: src.conf.5: regenerate after switch to BSD diff3

Branches

Unknown

Tags

Unknown

Event Timeline

bapt committed rG284a0aa96eb6: diff3: add 3 missing files from the testsuite (authored by bapt).Feb 13 2026, 7:26 PM

des mentioned this in rG1449573b44c7: diff3: add 3 missing files from the testsuite.Mar 22 2026, 8:06 AM

Changes (2)

Path

Size

usr.bin/

diff3/

tests/

conflict-Em.out

conflict-merge.out

rG284a0aa96eb6

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

Loading...

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

Loading...