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