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-15 23:28:10 -0700 |
| commit | fadf488f9b8c4fc709f0b083d2769ecc1e0e1119 (patch) | |
| tree | 9af600ad8903ae3f6aa32cabf713b8945f5f4ff5 /diffcore-pickaxe.c | |
| parent | Move buffer_is_binary() to xdiff-interface.h (diff) | |
| download | tgif-fadf488f9b8c4fc709f0b083d2769ecc1e0e1119.tar.xz | |
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>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions