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