Mercurial > hg-stable
changeset 6011:15a53af36a89
filemerge: two fixes for kdiff3 example configuration
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Sun, 03 Feb 2008 22:27:53 -0600 |
| parents | 83d193a513c8 |
| children | e45de0f47215 |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/mergetools.hgrc Thu Jan 31 22:32:11 2008 -0600 +++ b/contrib/mergetools.hgrc Sun Feb 03 22:27:53 2008 -0600 @@ -3,7 +3,8 @@ [merge-tools] kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output kdiff3.regkey=Software\KDiff3 -kdiff3.append=\kdiff3.exe +kdiff3.regappend=\kdiff3.exe +kdiff3.fixeol=True kdiff3.gui=True gvimdiff.args=--nofork -d -g -O $local $other $base