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