Could we use

~~~
$ hg merge --tool kdiff3
~~

to avoid users going to `vimdiff`?