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

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index 586cef9..3b3175b 100644
--- a/stgit/gitmergeonefile.py
+++ b/stgit/gitmergeonefile.py
@@ -31,15 +31,11 @@ class GitMergeException(Exception):
 # Options
 #
 try:
-    merger = config.get('gitmergeonefile', 'merger')
+    merger = config.get('stgit', 'merger')
+    keeporig = config.get('stgit', 'keeporig')
 except Exception, err:
     raise GitMergeException, 'Configuration error: %s' % err
 
-if config.has_option('gitmergeonefile', 'keeporig'):
-    keeporig = config.get('gitmergeonefile', 'keeporig')
-else:
-    keeporig = 'yes'
-
 
 #
 # Utility functions