This patch series adds a failing test and then a fix for the condition
discussed in these threads:

I previously floated this wrong-headed test after the same problem:

[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
More majordomo info at

Reply via email to