X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-resolve.sh;h=75e1de49ac9adb443e6065c93ac691c27f0f5518;hb=289370578ca5833641fbb59813173ac6db1986d1;hp=966e81ff7d353beb15ac2c9ed9a50a1ea45c876c;hpb=069b20a198f171512a1d2d2163b40f70c94f5257;p=git.git

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 966e81ff7..75e1de49a 100755
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Linus Torvalds
 # Copyright (c) 2005 Junio C Hamano
 #
-# Resolve two trees, using enhancd multi-base read-tree.
+# Resolve two trees, using enhanced multi-base read-tree.
 
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=
@@ -38,7 +38,7 @@ then
 fi
 
 git-update-index --refresh 2>/dev/null
-git-read-tree -u -m $bases $head $remotes || exit 2
+git-read-tree -u -m --aggressive $bases $head $remotes || exit 2
 echo "Trying simple merge."
 if result_tree=$(git-write-tree  2>/dev/null)
 then