Meta/Reintegrate: work around minor --no-edit breakage

For --no-edit to be true replacement of one-shot export of EDITOR=:,
it should trigger stripspace() to remove comments, but currently it
doesn't.  Avoid using it for now.

diff --git a/Reintegrate b/Reintegrate
index 98fb07dde885eba4e5db2835466ebcbfaa84fc24..419e9127d94a31482b3dfaaaebad19d1a50da5c2 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -100,7 +100,7 @@ no)
                        mb=$(git merge-base "$tip" "$save")
                        test "$mb" = "$tip" && continue
 
-                       git merge $accept_rerere --no-edit "$branch" ||
+                       EDITOR=: git merge $accept_rerere "$branch" ||
                        accept_rerere ||
                        exit