diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-05 06:36:49 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-05 10:07:19 +0400 |
| commit | 9f30855d0ff5206e85e45f0307be9d18ffda41d3 (patch) | |
| tree | e30410dbde5863a683dcaea3d70689dd141f5afa /builtin-merge-file.c | |
| parent | 6bfce93e04d13ecb42008a3cf214cc892f480f0c (diff) | |
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>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions