diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-05 03:36:49 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-06-04 23:07:19 -0700 |
| commit | 9f30855d0ff5206e85e45f0307be9d18ffda41d3 (patch) | |
| tree | e30410dbde5863a683dcaea3d70689dd141f5afa /builtin-apply.c | |
| parent | Move buffer_is_binary() to xdiff-interface.h (diff) | |
| download | tgif-9f30855d0ff5206e85e45f0307be9d18ffda41d3.tar.xz | |
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-apply.c')
0 files changed, 0 insertions, 0 deletions