Set GIT_MERGE_AUTOEDIT=no in the environment.

diff --git a/packaging/patch-update b/packaging/patch-update
index a1cb42c77b8cb7eac35b8b75a8418fa88a983186..4839716d713fea661ae8865e86a1a81521e432a0 100755 (executable)
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -23,6 +23,8 @@ my $make_gen_cmd = 'make -f prepare-source.mak conf && ./config.status && make g
 );
 &usage if $help_opt;
 
+$ENV{GIT_MERGE_AUTOEDIT} = 'no';
+
 if (defined $incl_generated_files) {
     $patches_dir = $incl_generated_files if $incl_generated_files ne '';
     $incl_generated_files = 1;