This patch series adds a failing test and then a fix for the condition discussed in these threads: http://article.gmane.org/gmane.comp.version-control.git/177224 http://article.gmane.org/gmane.comp.version-control.git/201045 http://article.gmane.org/gmane.comp.version-control.git/200178/match=merge_rr I previously floated this wrong-headed test after the same problem: http://article.gmane.org/gmane.comp.version-control.git/177231 [PATCH 1/2] test: mergetool ignores rerere in git-stash [PATCH 2/2] Clear rerere status during stash conflict -- 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