From: Junio C Hamano <junkio@cox.net>
Date: Tue, 19 Dec 2006 00:20:53 +0000 (-0800)
Subject: rerere: fix breakage of resolving.
X-Git-Tag: v1.5.0-rc0~68
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8336afa563fbeff35e531396273065161181f04c?hp=8336afa563fbeff35e531396273065161181f04c

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>
---