summaryrefslogtreecommitdiff
path: root/mozilla-sha1/sha1.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-18 16:20:53 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-18 16:20:53 -0800
commit8336afa563fbeff35e531396273065161181f04c (patch)
tree7187470ff1de2c9f5906ca053277314e30bb62f2 /mozilla-sha1/sha1.h
parentAdd config example with respect to branch (diff)
downloadtgif-8336afa563fbeff35e531396273065161181f04c.tar.xz
rerere: fix breakage of resolving.
commit e2b70087 botched the RCS merge to git-merge-file conversion. There is no command called "git merge-file" (yes, we are using safer variant of Perl's system(3)). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'mozilla-sha1/sha1.h')
0 files changed, 0 insertions, 0 deletions