projects
/
mw
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default config for merge tool
[mw]
/
src
/
mw
/
metadir.py
diff --git
a/src/mw/metadir.py
b/src/mw/metadir.py
index 0549c83b4232850e28754dd77db5308e0f4f36c6..db2ff627fe7c32868361afdf872c389f09feae4a 100644
(file)
--- 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 = 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'))
self.save_config()
# create cache/
os.mkdir(os.path.join(self.location, 'cache'))
Benjamin Mako Hill
||
Want to submit a patch?