diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:07:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:07:56 -0700 |
| commit | d5a72fd622ecedaea272cd6292abb7138a49e460 (patch) | |
| tree | 43f5dc2403d372cca26333cf8ed491709844db5d /tree.c | |
| parent | db823d4a5a47d614895c959dce2a379a2364b677 (diff) | |
| download | git-d5a72fd622ecedaea272cd6292abb7138a49e460.tar.gz | |
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 'tree.c')
0 files changed, 0 insertions, 0 deletions