[PATCH] update: introduce --tool for controlling the merge tool

[Mads Kiilerich]

On 05/26/2014 06:31 PM, Augie Fackler wrote:
> On Mon, May 19, 2014 at 01:53:39AM +0200, Mads Kiilerich wrote:
>> # HG changeset patch
>> # User Mads Kiilerich <madski at unity3d.com>
>> # Date 1400457214 -7200
>> #      Mon May 19 01:53:34 2014 +0200
>> # Node ID 1d24b3e5efdbb7f972f5dfe862b334cf4a64e5e4
>> # Parent  883e268cb860c0ea2eb0faa94114e11c3a4a3893
>> update: introduce --tool for controlling the merge tool
> bikeshed: could this be --merge-tool instead of --tool? The reason I
> ask is that it's a non-obvious flag name when it's embedded on 'hg
> update'.

I see your point. The help will however explain it as "specify merge tool".

But more important: The option is called --tool in all other places. It 
would be inconsistent if it was called something else here. It would 
require a special entry in commands.py and a special explanation in 
merge-tools.txt. I think it is better to stick with --tool.

/Mads