Add option to automatically invoke the interactive merger

[stgit] / stgit / config.py

diff --git a/stgit/config.py b/stgit/config.py
index 2174f09..f5fbdab 100644 (file)
--- 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')