From: Joseph Reagle Date: Thu, 10 Feb 2011 13:37:16 +0000 (-0500) Subject: default config for merge tool X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/bd55bd8c37765aaa7a4c9990b8314b6ffe60fcf0?ds=inline default config for merge tool --- diff --git a/src/mw/metadir.py b/src/mw/metadir.py index 0549c83..db2ff62 100644 --- a/src/mw/metadir.py +++ b/src/mw/metadir.py @@ -67,6 +67,8 @@ class Metadir(object): self.config = ConfigParser.RawConfigParser() self.config.add_section('remote') self.config.set('remote', 'api_url', api_url) + self.config.add_section('merge') + self.config.set('merge', 'tool', 'kidff3 %s %s -o %s') self.save_config() # create cache/ os.mkdir(os.path.join(self.location, 'cache'))