X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/79df2f0df89f382b63e4122aa15099a257a06463..f7ed76a9b6158888e8efe2faef9c095802fd93fe:/stgit/config.py

diff --git a/stgit/config.py b/stgit/config.py
index 2174f09..f5fbdab 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -69,6 +69,7 @@ def config_setup():
     config.set('stgit', 'merger',
                'diff3 -L current -L ancestor -L patched -m -E ' \
                '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
+    config.set('stgit', 'autoimerge', 'no')
     config.set('stgit', 'keeporig', 'yes')
     config.set('stgit', 'keepoptimized', 'no')
     config.set('stgit', 'extensions', '.ancestor .current .patched')