merge-recursive: do not rudely die on binary merge
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Aug 2007 22:33:07 +0000 (15:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2007 05:20:01 +0000 (22:20 -0700)
commitb798671...a935492ce511766bc99fb26b2892499b
tree6a28de7...dea881193189cee59a6c499a254d4767copy hash to clipboard (tree)
parent9fa3465...6be83c08ed24762c82eb33cb005729f3copy hash to clipboard (diff)
merge-recursive.c
t/t6027-merge-binary.sh [new file with mode: 0755]