Konstantin Svist escribió:
Just looked it up - not bad, but it doesn't allow you to edit/merge files. I guess it can be a nice default for "svn diff" :) Oh, and kdiff3 can also do 3-way comparisons. I rarely use that feature, though...
kdiff3 is the default merge tool for hg.