projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 910c00c) | patch
rerere: fix breakage of resolving.
authorJunio C Hamano <junkio@cox.net>
Tue, 19 Dec 2006 00:20:53 +0000 (16:20 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 19 Dec 2006 00:20:53 +0000 (16:20 -0800)
commit8336afa563fbeff35e531396273065161181f04c
tree7187470ff1de2c9f5906ca053277314e30bb62f2tree | snapshot
parent910c00c8ca4d998edb318cc232c03ec855cfa161commit | diff
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>
git-rerere.perl diff | blob | history
Git—the stupid content tracker