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