xref
: /
freebsd
/
usr.bin
/
diff3
/
tests
/
3.out
(revision a4e5e0106ac7145f56eb39a691e302cabb4635be)
Home
History
Annotate
Line#
Scopes#
Navigate#
Raw
Download
current directory
1
3a
2
=======
3
and a few typ0s to fix
4
>>>>>>> 3
5
.
6
1a
7
<<<<<<< 1
8
.
9