do_merge: don't use --no-ff for merges

diff --git a/do_merge b/do_merge
index 5deedaba27c7626d3bc4d09c5d082aed11372216..0d1cc1b1f62bc24d7843ef928175947dbfd2dd2f 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -113,7 +113,7 @@ for h in $heads; do
                do_rebase $h $tree
                ;;
        *)
-               execute git merge --no-ff $h || {
+               execute git merge $h || {
                        echo Merge failed 1>&2
                        echo $h >>../merge.debug
                        git diff >>../merge.debug 2>&1