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

summary refs log tree commit diff stats

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

blob: e62cac5c88b9928f2695b934c70efa4285324478 (plain)

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