diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-18 16:20:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-18 16:20:53 -0800 |
| commit | 8336afa563fbeff35e531396273065161181f04c (patch) | |
| tree | 7187470ff1de2c9f5906ca053277314e30bb62f2 /mozilla-sha1 | |
| parent | Add config example with respect to branch (diff) | |
| download | tgif-8336afa563fbeff35e531396273065161181f04c.tar.xz | |
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>
Diffstat (limited to 'mozilla-sha1')
0 files changed, 0 insertions, 0 deletions