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