Visual diff survey
Kevin Maris
lounginsince84 at gmail.com
Mon Jan 4 16:11:06 CST 2010
I'm using winmerge. My uses for it are very simple, and naturally so
is my config. I think pretty much everything is at defaults. From my
mercurial.ini:
[extdiff]
cmd.winmerge = C:\Program Files\WinMerge\WinMergeU.exe
opts.winmerge = /e /x /ub /wl
[tortoisehg]
vdiff = winmerge
vdiffnowin = True
postpull = update
[ui]
username = <deleted>
merge = winmergeu
On Fri, Jan 1, 2010 at 12:23 PM, Steve Borho <steve at borho.org> wrote:
> Hey folks,
>
> I'm in the middle of updating the visual diff configurations that will
> ship with TortoiseHg 0.10 and would like some feedback on which visual
> diff tools are being used, and the configurations you use for them
> (both extdiff and merge-tools configurations). The goal is for
> TortoiseHg to detect visual diff tools in release 0.10, much as it
> detects merge tools today, and for THG to come preconfigured to use
> those visual diff tools in the best way possible.
>
> To give you an idea of how this works, here is the new configuration
> for BeyondCompare:
>
> [merge-tools]
> beyondcompare3.priority=-1
> beyondcompare3.args=$local $other $base $output /ro /lefttitle=parent1
> /centertitle=base /righttitle=parent2 /automerge /reviewconflicts
> /solo
.....
> Again, I'm hoping people respond to this with their extdiff
> configurations and with any changes they've made to the default
> merge-tools configuration that ships with Mercurial.
>
> Cheers.
>
> --
> Steve Borho
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
More information about the Mercurial
mailing list