Mercurial > hg-stable
changeset 6560:90ec0e8fa4d0
mergetools.hgrc patch
| author | Neal Becker <ndbecker2@gmail.com> |
|---|---|
| date | Wed, 16 Apr 2008 15:26:37 -0700 |
| parents | 3182602fa1fb |
| children | c242fc76958e |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/mergetools.hgrc Wed Apr 16 16:04:07 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