mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-21 12:39:56 +03:00
Code Issues Projects Releases Wiki Activity
5d754f7dda
git-imerge/t
History
Michael Haggerty 5d754f7dda Add a simple script for exercising git-imerge in a merge with a conflict.
2013-05-05 06:44:45 +02:00
..
create-test-repo Add a script to create a test repository. 2013-05-04 12:21:45 +02:00
test-conflicted Add a simple script for exercising git-imerge in a merge with a conflict. 2013-05-05 06:44:45 +02:00
test-conflictless Add a simple script for exercising git-imerge in a conflictless merge. 2013-05-05 06:44:21 +02:00