summaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-06-05 02:36:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-05 06:07:19 (GMT)
commit9f30855d0ff5206e85e45f0307be9d18ffda41d3 (patch)
treee30410dbde5863a683dcaea3d70689dd141f5afa /fetch-pack.c
parent6bfce93e04d13ecb42008a3cf214cc892f480f0c (diff)
downloadgit-9f30855d0ff5206e85e45f0307be9d18ffda41d3.zip
git-9f30855d0ff5206e85e45f0307be9d18ffda41d3.tar.gz
git-9f30855d0ff5206e85e45f0307be9d18ffda41d3.tar.bz2
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 'fetch-pack.c')
0 files changed, 0 insertions, 0 deletions