diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:47:08 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:47:08 +0000 |
| commit | 29b5ab554790bb57337a3b6ab9dcd963cf69d22e (patch) | |
| tree | be1456d2bc6c1fb078695fad7bc8f6b212062d3c /tests/resources/mergedrepo/conflicts-two.txt | |
| parent | Initial commit. (diff) | |
| download | libgit2-29b5ab554790bb57337a3b6ab9dcd963cf69d22e.tar.xz libgit2-29b5ab554790bb57337a3b6ab9dcd963cf69d22e.zip | |
Adding upstream version 1.7.2+ds.upstream/1.7.2+ds
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
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 0000000..e62cac5 --- /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 |