opnsense-src/usr.bin/diff3/tests/4.out

mirror of https://github.com/opnsense/src.git synced 2026-02-15 08:38:13 -05:00
3a
=======
and a few typ0s to fix
>>>>>>> 3
.
1a
<<<<<<< 1
.
Import working progress BSD diff3 import bsd diff3 from OpenBSD. Differences with OpenBSD: - lots of warning fixed - no shell wrapper with diff3 actually living in libexec - capsicumized Keep it disconnected as it is not yet good enough to replace GNU diff The motivation to import it now it to allow other people to jump in and also to have an open development on it Obtained from: OpenBSD 2017-05-25 13:45:50 -04:00			`3a`
			`=======`
			`and a few typ0s to fix`
			`>>>>>>> 3`
			`.`
			`1a`
			`<<<<<<< 1`
			`.`