X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-octopus.sh;h=eb3f473d5a3ac2a894503c1a7601b763548f8722;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=eb74f96e81b4980f395944da46602e29555fc6db;hpb=36b5b3c65948694d9a92de5a17f2b97c3cd84879;p=git.git

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index eb74f96e..eb3f473d 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -90,7 +90,7 @@ do
 	NON_FF_MERGE=1
 
 	echo "Trying simple merge with $SHA1"
-	git-read-tree -u -m $common $MRT $SHA1 || exit 2
+	git-read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
 	next=$(git-write-tree 2>/dev/null)
 	if test $? -ne 0
 	then