Phil Hord <phil.hord@xxxxxxxxx> 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html