From: Wayne Davison <wayned@samba.org>
Date: Thu, 31 Jul 2014 22:59:32 +0000 (-0700)
Subject: Set GIT_MERGE_AUTOEDIT=no in the environment.
X-Git-Tag: v3.1.2pre1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc55aa04dfe77d2b680eab2ea74b46f8a29e5ccb;p=thirdparty%2Frsync.git

Set GIT_MERGE_AUTOEDIT=no in the environment.
---

diff --git a/packaging/patch-update b/packaging/patch-update
index a1cb42c7..4839716d 100755
--- 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;