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