From bd55bd8c37765aaa7a4c9990b8314b6ffe60fcf0 Mon Sep 17 00:00:00 2001
From: Joseph Reagle <joseph.2008@reagle.org>
Date: Thu, 10 Feb 2011 08:37:16 -0500
Subject: [PATCH 1/1] default config for merge tool

---
 src/mw/metadir.py | 2 ++
 1 file changed, 2 insertions(+)

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