aboutsummaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
Commit message (Expand)AuthorAge
* merge-recursive: do not rudely die on binary mergeJunio C Hamano2007-08-14