git-gui: MERGE_RR lives in .git/ directly with newer Git versions