From bc55aa04dfe77d2b680eab2ea74b46f8a29e5ccb Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 31 Jul 2014 15:59:32 -0700
Subject: [PATCH] Set GIT_MERGE_AUTOEDIT=no in the environment.

---
 packaging/patch-update | 2 ++
 1 file changed, 2 insertions(+)

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;
-- 
2.47.2