proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-27 22:24:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6b92c99bcb
libgit2/tests/resources/merge-resolve
History
Edward Thomson 6b92c99bcb Don't try to merge binary files
2014-01-20 17:15:12 -05:00
..
.gitted Don't try to merge binary files 2014-01-20 17:15:12 -05:00
added-in-master.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
automergeable.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
changed-in-branch.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
changed-in-master.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
conflicting.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
removed-in-branch.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00
unchanged.txt Rename tests-clar to tests 2013-11-14 14:05:52 -08:00