aboutsummaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
Commit message (Expand)AuthorAge
* tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-17
* add test_cmp function for test scriptsJeff King2008-03-13
* merge-recursive: do not rudely die on binary mergeJunio C Hamano2007-08-14