| commit | fadf488f9b8c4fc709f0b083d2769ecc1e0e1119 | |
| 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> | |
| Sat, 16 Jun 2007 06:28:10 +0000 (15 23:28 -0700) | ||
| tree | 9af600ad8903ae3f6aa32cabf713b8945f5f4ff5 | treesnapshot (tar.gz zip) |
| parent | 634cd48a8afdd920fa26c8ec3ae43e96c82c81f2 | commitdiff |
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>
[jc: cherry-picked 9f30855 from 'master']
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 |