[PATCH 5 of 5] commands: merge and resolve have new option tool

[Frank Kingswood]

S. Heimberg wrote:
> # HG changeset patch
> # User simohe at besonet.ch
> # Date 1218044877 -7200
> # Node ID aecf481af058053bae639a306650815eaa65c816
> # Parent  44bdc2e3a7dcd38f6448d4118c355004eef22bc2
> commands: merge and resolve have new option tool

> +mergeopts = [
> +    ('t', 'tool', '', _('force to use merge tool'))
> +]
> +
Hmmm, using a single letter option for something that is just a wart to 
Mercurial to help out systems where "HGMERGE=blah hg merge..." does not 
work seems unfortunate. Can this be --tool only?

Frank