[issue2226] mergetools.rc addition for UltraCompare

[Tim Pietzcker]

New submission from Tim Pietzcker <tim at pietzckers.de>:

In case this is of interest, here is a section that could be added to
MergeTools.rc in order to support UltraCompare
(http://www.ultraedit.com/products/ultracompare.html) as a Merge/Diff tool
(also see attachment where word wrap doesn't break the command lines):

UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
UltraCompare.args = $base $local $other -title1 base -title3 other
UltraCompare.priority = -2
UltraCompare.gui = True
UltraCompare.binary = True
UltraCompare.checkconflicts = True
UltraCompare.checkchanged = True
UltraCompare.diffargs=$child $parent -title1 child -title2 parent
UltraCompare.diff3args=$child $parent1 $parent2 -title1 child -title2
parent1 -title2 parent2

Haven't tried it under Win7 x64 yet, where the correct "regkey" entry would
have to be 

Software\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\UC.exe 

It has to be noted that UltraCompare doesn't support a three-way merge in
the same way as, say, Beyond Compare - there is no "output file", so the
local file needs to be overwritten in UltraCompare itself. Since it might be
necessary to merge changes from "base" and "other" into "local", I have put
"local" in the middle pane (where merges from left and right are possible).

----------
files: UltraCompare.txt
messages: 12744
nosy: pietzcker
priority: feature
status: unread
title: mergetools.rc addition for UltraCompare

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2226>
____________________________________________________
-------------- next part --------------
UltraCompare.regkey=Software\Microsoft\Windows\CurrentVersion\App Paths\UC.exe
UltraCompare.args = $base $local $other -title1 base -title3 other
UltraCompare.priority = -2
UltraCompare.gui = True
UltraCompare.binary = True
UltraCompare.checkconflicts = True
UltraCompare.checkchanged = True
UltraCompare.diffargs=$child $parent -title1 child -title2 parent
UltraCompare.diff3args=$child $parent1 $parent2 -title1 child -title2 parent1 -title2 parent2