Merge branch 'lt/diff-tree'

diff --git a/git-am.sh b/git-am.sh
index 731ab1fffa4fbe563ab5e2c09cbbdca07e16cac4..ee6886f300f507b26bd8f96a01d30cb7c6d2ee39 100755 (executable)
--- 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
     }