e1910ebda4
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
20 lines
162 B
Plaintext
20 lines
162 B
Plaintext
4a
|
|
>>>>>>> 3
|
|
.
|
|
4a
|
|
<<<<<<< 2
|
|
New line
|
|
=======
|
|
.
|
|
3a
|
|
||||||| 2
|
|
which multiple lines
|
|
and a few typos to fix
|
|
=======
|
|
and a few typ0s to fix
|
|
>>>>>>> 3
|
|
.
|
|
1a
|
|
<<<<<<< 1
|
|
.
|