Merge branch 'lt/diff-tree'

diff --git a/git-am.sh b/git-am.sh
index 1a114bcc0809836ed4edaa0866704b899e587cd2..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
     }
@@ -211,6 +212,7 @@ this=`cat "$dotest/next"`
 if test "$skip" = t
 then
        this=`expr "$this" + 1`
+       resume=
 fi
 
 if test "$this" -gt "$last"
@@ -225,6 +227,7 @@ do
        msgnum=`printf "%0${prec}d" $this`
        next=`expr "$this" + 1`
        test -f "$dotest/$msgnum" || {
+               resume=
                go_next
                continue
        }