CODEWITHSUNDEEP
tortoisesvndifftortoisehg
ashes999
ashes999

Reputation: 10163

TortoiseHg with TortoiseSvn Diff

I recently switched over from SVN to Hg. I used to use TortoiseSVN, and now I'm using TortoiseHg. One thing I really miss, though, are the TortoiseSVN style diffs; the Hg ones are just harder to read and understand.

Is there some way to tell TortoiseHg to use the TortoiseSVN diff tool?

Upvotes: 6

Views: 3481

Answers (3)

vitrilo
vitrilo

Reputation: 1517

Put following into Mercurial.ini:

[tortoisehg]
vdiff = tortoisediff

[extdiff]
cmd.tortoisediff = C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
opts.tortoisediff = /base:"$parent" /basename:"$plabel1" /theirs:"$child" /theirsname:"$clabel"

Upvotes: 0

cregox
cregox

Reputation: 18408

No idea why TortoiseHg doesn't come with this built in, because both TortoiseSVN and TortoiseGIT do.

So we have to somehow download TortoiseIDiff.exe from either project, add it to our TortoiseHg folder and add something along those lines into Mercurial.ini, which currently can be found under Windows Explorer's contextual menu (right mouse click) > TortoiseHg > Global Settings > Edit File:

[extdiff]
cmd.tortoisediff = C:\Program Files\TortoiseHg\TortoiseIDiff.exe
opts.tortoisediff = /left:"$parent" /lefttitle:"$plabel1" /right:"$child" /righttitle:"$clabel" /showinfo

Upvotes: 4

manojlds
manojlds

Reputation: 301327

Right Click -> TortoiseHg -> Global Settings -> TortoiseHg -> Visual Diff tool -> Choose TortoiseMerge

Upvotes: 7

Related Questions