summaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
AgeCommit message (Expand)Author
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano
2008-03-13add test_cmp function for test scriptsJeff King
2007-08-15merge-recursive: do not rudely die on binary mergeJunio C Hamano