summaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
Commit message (Expand)AuthorAgeFilesLines
* add test_cmp function for test scriptsJeff King2008-03-131-2/+2
* merge-recursive: do not rudely die on binary mergeJunio C Hamano2007-08-141-0/+67