Changes in conflict-Em.out en Copyright 2015 Java 284a0aa96eb63f12831a9e06514a50b2cd80957f - diff3: add 3 missing files from the testsuite http://kernelsources.org:8080/source/history/freebsd/usr.bin/diff3/tests/conflict-Em.out#284a0aa96eb63f12831a9e06514a50b2cd80957f diff3: add 3 missing files from the testsuiteFixes: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b List of files: /freebsd/usr.bin/diff3/tests/conflict-Em.out Fri, 13 Feb 2026 18:45:39 +0100 Baptiste Daroussin <bapt@FreeBSD.org>