![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 5 May 2005 23:07:56 +0000 (16:07 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Thu, 5 May 2005 23:07:56 +0000 (16:07 -0700) | ||
| commit | d5a72fd622ecedaea272cd6292abb7138a49e460 | |
| tree | 43f5dc2403d372cca26333cf8ed491709844db5d | tree | snapshot |
| parent | db823d4a5a47d614895c959dce2a379a2364b677 | commit | 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.
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 | history |