X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a0f2cfcb8c45c388c2161bb30bcdbad21667f405..c19dc3db115d85537dbdf0b4f12dc8b3bc9481c4:/stgit/config.py

diff --git a/stgit/config.py b/stgit/config.py
index 042af63..a124cb7 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -32,14 +32,18 @@ config = ConfigParser.RawConfigParser()
 config.add_section('stgit')
 config.set('stgit', 'autoresolved', 'no')
 config.set('stgit', 'smtpserver', 'localhost:25')
-
-config.add_section('gitmergeonefile')
-config.set('gitmergeonefile', 'merger',
+config.set('stgit', 'merger',
            'diff3 -L local -L older -L remote -m -E ' \
            '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
-config.set('gitmergeonefile', 'keeporig', 'yes')
+config.set('stgit', 'keeporig', 'yes')
 
 # Read the configuration files (if any) and override the default settings
 config.read('/etc/stgitrc')
 config.read(os.path.expanduser('~/.stgitrc'))
 config.read(os.path.join(__git_dir, 'stgitrc'))
+
+# [gitmergeonefile] section is deprecated. In case it exists copy the
+# options/values to the [stgit] one
+if config.has_section('gitmergeonefile'):
+    for option, value in config.items('gitmergeonefile'):
+        config.set('stgit', option, value)