summaryrefslogtreecommitdiff
path: root/ls-tree.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 23:07:56 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 23:07:56 (GMT)
commitd5a72fd622ecedaea272cd6292abb7138a49e460 (patch)
tree43f5dc2403d372cca26333cf8ed491709844db5d /ls-tree.c
parentdb823d4a5a47d614895c959dce2a379a2364b677 (diff)
downloadgit-d5a72fd622ecedaea272cd6292abb7138a49e460.zip
git-d5a72fd622ecedaea272cd6292abb7138a49e460.tar.gz
git-d5a72fd622ecedaea272cd6292abb7138a49e460.tar.bz2
Fix git-resolve-script.
I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug.
Diffstat (limited to 'ls-tree.c')
0 files changed, 0 insertions, 0 deletions