git-imerge/t
Michael Haggerty 3258cfdfb4 Rename "test-conflictless" to "test-unconflicted".
I have typed it wrong several times now so it seems to want its
new name.
2013-05-14 07:46:53 +02:00
..
.gitignore Fix test scripts' use of directories. 2013-05-11 16:24:09 +02:00
create-test-repo Fix test scripts' use of directories. 2013-05-11 16:24:09 +02:00
reset-test-repo Add a script to remove test detritus from the temporary test repository. 2013-05-11 16:29:18 +02:00
test-conflicted Fix test scripts' use of directories. 2013-05-11 16:24:09 +02:00
test-unconflicted Rename "test-conflictless" to "test-unconflicted". 2013-05-14 07:46:53 +02:00