diff options
Diffstat (limited to 'tests/resources/mergedrepo/.gitted/MERGE_MSG')
| -rw-r--r-- | tests/resources/mergedrepo/.gitted/MERGE_MSG | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/resources/mergedrepo/.gitted/MERGE_MSG b/tests/resources/mergedrepo/.gitted/MERGE_MSG new file mode 100644 index 000000000..7c4d1f5a9 --- /dev/null +++ b/tests/resources/mergedrepo/.gitted/MERGE_MSG @@ -0,0 +1,5 @@ +Merge branch 'branch' + +Conflicts: + conflicts-one.txt + conflicts-two.txt |