xref: /freebsd/usr.bin/diff3/tests/simple-merge.out (revision 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b)
1this is an new line
2
3this is a local line
4