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)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found