diff options
Diffstat (limited to '')
| -rw-r--r-- | tests/resources/merge-resolve/unchanged.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/unchanged.txt b/tests/resources/merge-resolve/unchanged.txt new file mode 100644 index 0000000..c8f06f2 --- /dev/null +++ b/tests/resources/merge-resolve/unchanged.txt @@ -0,0 +1 @@ +this file is unchanged in both |