conflicts-two.txt « mergedrepo « resources « tests-clar - 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-two.txt « mergedrepo « resources « tests-clar - 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-clar/resources/mergedrepo/conflicts-two.txt

blob: e62cac5c88b9928f2695b934c70efa4285324478 (plain)

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