diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-02-01 22:20:43 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-02-01 22:20:43 +0100 |
| commit | 91c69636c5147e0efa49e10f2778a4e101dbc610 (patch) | |
| tree | 5fea59c26d0b3724163c7fe30d64f9e66640fee9 | |
| parent | 031ed72041ce45e2e63b870644b2dfa9e084a15b (diff) | |
| download | quilt-91c69636c5147e0efa49e10f2778a4e101dbc610.tar.gz | |
I'm not sure it's really a good idea to bump --fuzz for merges; remove
that for now.
| -rw-r--r-- | quilt/push.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/quilt/push.in b/quilt/push.in index 2c832f1..17c1783 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -46,7 +46,7 @@ be used. -M, --merge Three-way merge format: all changes are merged into the patched - files (see diff3(1), merge(1)). Bumps the default fuzz factor to 3. + files (see diff3(1), merge(1)). --leave-rejects Leave around the reject files patch produced, even if the patch @@ -353,7 +353,7 @@ more_patch_args= if [ -n "$opt_merge" ] then more_patch_args="$more_patch_args --merge=rejects" - [ -z "$opt_fuzz" ] && opt_fuzz=3 + #[ -z "$opt_fuzz" ] && opt_fuzz=3 fi [ -n "$opt_fuzz" ] && more_patch_args="$more_patch_args -F$opt_fuzz" |