Mercurial > hg
changeset 7665:950484f05f16
Update win32 merge tools configuration
Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.
| author | Pascal Quantin <pascal.quantin@gmail.com> |
|---|---|
| date | Sat, 17 Jan 2009 18:51:40 +0100 |
| parents | 3cc74ee75b0d |
| children | 2ad81e9b075b |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/mergetools.hgrc Tue Jan 13 20:28:06 2009 +0200 +++ b/contrib/mergetools.hgrc Sat Jan 17 18:51:40 2009 +0100 @@ -38,8 +38,9 @@ p4merge.gui=True p4merge.priority=-8 -tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output +tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output tortoisemerge.regkey=Software\TortoiseSVN +tortoisemerge.checkchanged=True tortoisemerge.gui=True ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output @@ -49,3 +50,13 @@ filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge filemerge.args=-left $other -right $local -ancestor $base -merge $output filemerge.gui=True + +beyondcompare3.executable=C:\Program Files\Beyond Compare 3\BComp.exe +beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts +beyondcompare3.gui=True + +winmerge.args=/e /u /dl local /dr other /wr $local $other $output +winmerge.regkey=Software\Thingamahoochie\WinMerge +winmerge.regname=Executable +winmerge.checkchanged=True +winmerge.gui=True