X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/9e3f506f0d0e1b0c09d1e9d7051af23bfede7834..c6f366f6b7452e24edf5bff06da8b69c500899a4:/stgit/config.py

diff --git a/stgit/config.py b/stgit/config.py
index 2174f09..a6afbfd 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -69,9 +69,11 @@ 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')
+    config.set('stgit', 'shortnr', '5')
 
     # Read the configuration files (if any) and override the default settings
     # stgitrc are read for backward compatibility