Merge branch 'jc/nostat'

diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
index 966e81ff7d353beb15ac2c9ed9a50a1ea45c876c..0a8ef216cb8a45df7f900a0c9698bec3e4bb47bb 100755 (executable)
--- a/git-merge-resolve.sh
+++ b/git-merge-resolve.sh
@@ -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