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')