conflicts-one.txt « mergedrepo « resources « tests - github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.

Welcome to mirror list, hosted at ThFree Co, Russian Federation.

conflicts-one.txt « mergedrepo « resources « tests - github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.

index : github.com/mono/libgit2.git

Unnamed repository; edit this file 'description' to name the repository.

www-data

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