aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-06-05 03:36:11 +0100
committerJunio C Hamano <gitster@pobox.com>2007-06-15 23:27:23 -0700
commit634cd48a8afdd920fa26c8ec3ae43e96c82c81f2 (patch)
treeef740f010a3a287514ce61583b8e92581621fecf /merge-recursive.c
parentfa0c87c34471286b6c261c781a45ed090135295c (diff)
downloadgit-634cd48a8afdd920fa26c8ec3ae43e96c82c81f2.tar.gz
git-634cd48a8afdd920fa26c8ec3ae43e96c82c81f2.tar.xz
Move buffer_is_binary() to xdiff-interface.h
We already have two instances where we want to determine if a buffer contains binary data as opposed to text. [jc: cherry-picked 6bfce93e from 'master'] Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions