]> git.ipfire.org Git - thirdparty/git.git/commit - git-resolve.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: db823d4) | patch
Fix git-resolve-script.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 23:07:56 +0000 (16:07 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 23:07:56 +0000 (16:07 -0700)
commitd5a72fd622ecedaea272cd6292abb7138a49e460
tree43f5dc2403d372cca26333cf8ed491709844db5dtree | snapshot
parentdb823d4a5a47d614895c959dce2a379a2364b677commit | diff
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.
git-resolve-script diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.