Andrew's git / gitweb.git / diff
?
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)
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>
No differences found