summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-16 21:22:05 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-16 21:22:05 -0700
commit0d38ab259e074cd0962451075faf120c416a0706 (patch)
tree76d73fd94997c865e694cb707d400fa31b6bc154 /builtin-merge-file.c
parentuse xstrdup please (diff)
downloadtgif-0d38ab259e074cd0962451075faf120c416a0706.tar.xz
applymbox: brown paper bag fix.
An earlier patch 87ab7992 broke applymbox by blindly copying piece from git-am, causing a harmless but annoying series of error messages. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions