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