e91f984b9d
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
18 lines
274 B
Plaintext
18 lines
274 B
Plaintext
This is a more complete test
|
|
<<<<<<< 1
|
|
which multiple lines
|
|
and a few typ0s to fix
|
|
||||||| 2
|
|
which multiple lines
|
|
and a few typos to fix
|
|
=======
|
|
and a few typ0s to fix
|
|
>>>>>>> 3
|
|
also I plan to add few lines
|
|
<<<<<<< 2
|
|
New line
|
|
=======
|
|
>>>>>>> 3
|
|
and to remove
|
|
other lines
|