conflicts-one.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-one.txt

blob: 8aad34cc83733590e74b93d0f7cf00375e2a735a (plain)

<<<<<<< HEAD
This is most certainly a conflict!
=======
This is a conflict!!!
>>>>>>> branch