proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-24 16:47:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7932ffba70
libgit2/tests/resources/mergedrepo/conflicts-one.txt
Ben Straub 1782038144 Rename tests-clar to tests
2013-11-14 14:05:52 -08:00

6 lines
93 B
Plaintext
Vendored
Raw Blame History

<<<<<<< HEAD
This is most certainly a conflict!
=======
This is a conflict!!!
>>>>>>> branch
Reference in New Issue View Git Blame Copy Permalink