Merge branch 'js/repoconfig' into next

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index eb74f96e81b4980f395944da46602e29555fc6db..eb3f473d5a3ac2a894503c1a7601b763548f8722 100755 (executable)
--- 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