merge-recursive: refuse to merge binary files
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Tue, 5 Jun 2007 02:36:49 +0000 (03:36 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Jun 2007 06:07:19 +0000 (23:07 -0700)
commit9f30855d0ff5206e85e45f0307be9d18ffda41d3
treee30410dbde5863a683dcaea3d70689dd141f5afa
parent6bfce93e04d13ecb42008a3cf214cc892f480f0c
merge-recursive: refuse to merge binary files

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6024-recursive-merge.sh