diff options
Diffstat (limited to 'tests/resources/mergedrepo/conflicts-two.txt')
| -rw-r--r-- | tests/resources/mergedrepo/conflicts-two.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/resources/mergedrepo/conflicts-two.txt b/tests/resources/mergedrepo/conflicts-two.txt new file mode 100644 index 000000000..e62cac5c8 --- /dev/null +++ b/tests/resources/mergedrepo/conflicts-two.txt @@ -0,0 +1,5 @@ +<<<<<<< HEAD +This is without question another conflict! +======= +This is another conflict!!! +>>>>>>> branch |