diff options
Diffstat (limited to 'usr.bin/diff3/tests/simple-merge.out')
| -rw-r--r-- | usr.bin/diff3/tests/simple-merge.out | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.bin/diff3/tests/simple-merge.out b/usr.bin/diff3/tests/simple-merge.out new file mode 100644 index 000000000000..c9ad1c1bed8f --- /dev/null +++ b/usr.bin/diff3/tests/simple-merge.out @@ -0,0 +1,3 @@ +this is an new line + +this is a local line |