Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools.hgrc patch
authorNeal Becker <ndbecker2@gmail.com>
Wed, 16 Apr 2008 15:26:37 -0700
changeset 6559 8b67211d9140
parent 6558 550c53d66949
child 6562 090f2145df7d
mergetools.hgrc patch
contrib/mergetools.hgrc file | annotate | diff | comparison | revisions 
--- a/contrib/mergetools.hgrc	Wed Apr 16 16:07:15 2008 +0200
+++ b/contrib/mergetools.hgrc	Wed Apr 16 15:26:37 2008 -0700
@@ -1,7 +1,7 @@
 # Some default global settings for common merge tools
 
 [merge-tools]
-kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
+kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
 kdiff3.regkey=Software\KDiff3
 kdiff3.regappend=\kdiff3.exe
 kdiff3.fixeol=True
Mercurial