mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-04-19 05:39:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Set GIT_MERGE_AUTOEDIT=no in the environment.

Browse Source
This commit is contained in:
Wayne Davison
2014-07-31 15:59:32 -07:00
parent f438d5abe0
commit bc55aa04df
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/patch-update
View File

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