1 files changed, 1 insertions, 0 deletions

diff --git a/git-am.sh b/git-am.sh
index 731ab1fffa..ee6886f300 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -88,6 +88,7 @@ fall_back_3way () {
     # saying that we reverted all those changes.
 
     git-merge-resolve $orig_tree -- HEAD $his_tree || {
+	    git-rerere
 	    echo Failed to merge in the changes.
 	    exit 1
     }