tree 5a6087ccd95cf00c8e23e8b325964ef78ca2046d
parent 1b79d1c2a8a90419238f7213870ab1dc465082fe
author Jay Soffian <jaysoffian@gmail.com> 1279127891 -0400
committer Junio C Hamano <gitster@pobox.com> 1279137865 -0700

MERGE_RR is in .git, not .git/rr-cache

0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the
location of MERGE_RR but I found a few references to the old
location.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>