[PATCH 2 of 5 V3] merge: add labels parameter from merge.update to filemerge

[Pierre-Yves David]

On 05/12/2014 05:47 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode<durham at fb.com>
> # Date 1399593263 25200
> #      Thu May 08 16:54:23 2014 -0700
> # Node ID 20a401c6feed49f6597e76789b055b0e84b20265
> # Parent  09732bdb2784d9402e278c36406819a98919c2ca
> merge: add labels parameter from merge.update to filemerge
>
> Adds a labels function parameter to all the functions between merge.update and
> filemerge.filemerge. This will allow commands like rebase to specify custom
> marker labels.

Note that all the internal configuration still use "local" and "other". 
including (but probably not limited to:

1. internal:local and internal:other
2. $local $other $base argument in mergetools-config (and it's help)
3. merge-tools help topic: (hg help merge-tools)

What's you plan to not confuse user to death in when local and other get 
renamed?

-- 
Pierre-Yves David