conflicts-two.txt\mergedrepo\resources\tests - delta/libgit2.git - github.com: libgit2/libgit2.git

index : delta/libgit2.git

github.com: libgit2/libgit2.git

summary refs log tree commit diff

path: root/tests/resources/mergedrepo/conflicts-two.txt

blob: e62cac5c88b9928f2695b934c70efa4285324478 (plain)

<<<<<<< HEAD
This is without question another conflict!
=======
This is another conflict!!!
>>>>>>> branch