Merge branch 'da/difftool'

diff --git a/contrib/examples/git-am.sh b/contrib/examples/git-am.sh
index 3b770281232904132ac10620ded4a36d36a00be5..dd539f1a8aa5cac185f427da6100a5d895411bfb 100755 (executable)
--- a/contrib/examples/git-am.sh
+++ b/contrib/examples/git-am.sh
@@ -512,7 +512,7 @@ then
                git read-tree --reset -u $head_tree $head_tree &&
                index_tree=$(git write-tree) &&
                git read-tree -m -u $index_tree $head_tree
-               git read-tree $head_tree
+               git read-tree -m $head_tree
                ;;
        ,t)
                if test -f "$dotest/rebasing"