Meta/Reintegrate: use merge --no-edit

diff --git a/Reintegrate b/Reintegrate
index ed57047217a4e9b85a05b50900266c776698ce89..686b6f464ee573851560ed4948681cf3d3939532 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -45,7 +45,7 @@ no)
                        save=$(git rev-parse --verify HEAD)
 
                        echo >&2 "* $branch"
-                       git merge "$branch" || accept_rerere || exit
+                       git merge --no-edit "$branch" || accept_rerere || exit
 
                        this=$(git rev-parse --verify HEAD)
                        if test "$this" = "$save"