summaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
AgeCommit message (Expand)Author
2007-08-15merge-recursive: do not rudely die on binary mergeJunio C Hamano