[thg] Visual diff survey

[Matt Joiner]

windows:

[extdiff]
cmd.tortoisemerge = tortoisemerge

[tortoisehg]
vdiff = tortoisemerge

[merge-tools]
#tortoisemerge.priority=-9
#tortoisemerge.args=/base:$output /mine:$local /theirs:$other
/merged:$output
#tortoisemerge.regkey=Software\TortoiseSVN
#tortoisemerge.gui=True

additionally, tortoisemerge shows an error for diffs against files which
don't exist, this occurs for files that have just been added, or deleted
from a repo. if the behaviour under tortoisesvn, that is diffing against an
empty file in these cases could be emulated, that would be great (can i do
this with some change to my tortoisemerge args or otherwise above?).

On Thu, Jan 7, 2010 at 11:25 PM, Matt Joiner <anacrolix at gmail.com> wrote:

>
>
> ---------- Forwarded message ----------
> From: Peter Arrenbrecht <peter.arrenbrecht at gmail.com>
> Date: Thu, Jan 7, 2010 at 11:18 PM
> Subject: Re: [thg] Visual diff survey
> To: Steve Borho <steve at borho.org>
> Cc: tortoisehg-discuss at lists.sourceforge.net, mercurial <
> mercurial at selenic.com>
>
>
> > 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.
>
> On Ubuntu:
>
> [extdiff]
> cmd.cxdiff = diff
> opts.cxdiff = -Nprc5
> cmd.meld =
> cmd.cdiff = colordiff
> opts.cdiff = -uprN
> cmd.cwdiff = diff
> opts.cwdiff = -wBNprc -C 5
> cmd.kdiff = kdiff3
> opts.kdiff =
> cmd.xxdiff = xxdiff
> opts.xxdiff =
> cmd.sub = submerge
> opts.sub = diff
>
> I use hgtk. And I almost never using anything except meld from the above.
> -parren
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20100114/c326cb82/attachment.htm>