conflicts-one.txt « mergedrepo « resources « tests - libgit2 - debian 12 backports: mozilla (cargo, rustc)

summary refs log tree commit diff stats

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

blob: 8aad34cc83733590e74b93d0f7cf00375e2a735a (plain)

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