Move MERGE_RR from .git/rr-cache/ into .git/