[thg] Visual diff survey
Peter Arrenbrecht
peter.arrenbrecht at gmail.com
Thu Jan 7 06:18:34 CST 2010
> 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
More information about the Mercurial
mailing list