Phil Hord [off-list ref] writes:
git mergetool decides to use rerere-remaining based on the existence
of the .git/MERGE_RR file:
if test -e "$GIT_DIR/MERGE_RR"
This is correct, I would probably write it with "test -f" if I were
writing this line today, though. After you commit to conclude the
merge, the MERGE_RR marker should disappear. Isn't it happening for
you?