diff options
Diffstat (limited to 'usr.bin/diff3/tests/4.out')
| -rw-r--r-- | usr.bin/diff3/tests/4.out | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr.bin/diff3/tests/4.out b/usr.bin/diff3/tests/4.out new file mode 100644 index 000000000000..81509d4ca510 --- /dev/null +++ b/usr.bin/diff3/tests/4.out @@ -0,0 +1,8 @@ +3a +======= +and a few typ0s to fix +>>>>>>> 3 +. +1a +<<<<<<< 1 +. |