![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Tue, 5 Jun 2007 02:37:13 +0000 (03:37 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 5 Jun 2007 06:10:29 +0000 (23:10 -0700) | ||
| commit | 5771907a5745799c559ff21ccfcabfd21cc23b36 | |
| tree | 47427699ad65ca3a9bd1b5192e53490fc5166623 | tree | snapshot |
| parent | 9f30855d0ff5206e85e45f0307be9d18ffda41d3 | commit | diff |
git-merge-file: 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>
| builtin-merge-file.c | diff | blob | history | |
| t/t6023-merge-file.sh | diff | blob | history |