Use BBEdit for diffing with Mercurial

Add the following lines to your ~/.hgrc file:

[extensions]
hgext.extdiff =

[extdiff]
cmd.bbdiff = bbdiff
opts.bbdiff = --resume --wait --reverse

Then diff with the bbdiff command:

$ hg bbdiff [...]