aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorAriel Badichi <abadichi@bezeqint.net>2008-04-23 04:06:27 +0300
committerJunio C Hamano <gitster@pobox.com>2008-04-22 21:23:16 -0700
commit75b7dfbdc030cfc6f09a6317444c36c4957a9133 (patch)
tree6f136ef87cf2fa585e96d610586d2ceea7ac88b4 /builtin-merge-file.c
parent8b1f6de854ae95eb3f4225a71aad29ca086cfd2e (diff)
downloadgit-75b7dfbdc030cfc6f09a6317444c36c4957a9133.tar.gz
git-75b7dfbdc030cfc6f09a6317444c36c4957a9133.tar.xz
archive.c: format_subst - fixed bogus argument to memchr
Also removed a superfluous test. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions