Johannes Schindelin fadf488f9b merge-recursive: refuse to merge binary files ...

[jc: cherry-picked 9f30855 from 'master']

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2007-06-15 23:28:10 -07:00

44 KiB

Raw Blame History

View Raw