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