| commit | 8336afa563fbeff35e531396273065161181f04c | |
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 19 Dec 2006 00:20:53 +0000 (18 16:20 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 19 Dec 2006 00:20:53 +0000 (18 16:20 -0800) | ||
| tree | 7187470ff1de2c9f5906ca053277314e30bb62f2 | treesnapshot (tar.gz zip) |
| parent | 910c00c8ca4d998edb318cc232c03ec855cfa161 | commitdiff |
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>
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>
| git-rerere.perl | diffblobblamehistory |