| commit | 9f30855d0ff5206e85e45f0307be9d18ffda41d3 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Tue, 5 Jun 2007 02:36:49 +0000 (5 03:36 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 5 Jun 2007 06:07:19 +0000 (4 23:07 -0700) | ||
| tree | e30410dbde5863a683dcaea3d70689dd141f5afa | treesnapshot (tar.gz zip) |
| parent | 6bfce93e04d13ecb42008a3cf214cc892f480f0c | commitdiff |
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>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory | |
| t/t6024-recursive-merge.sh | diffblobblamehistory |