simplemerge: take arguments as annotated context objects The labels we put in conflict markers are formatted so the part before the ':' (typically says things like "local") is padded so the ':' is aligned among the labels. That means that if you specify a long label for "base" but the conflict marker style is "merge" (i.e. 2-way), the other two will have unwanted padding. We often don't specify a label for the base, so we don't notice the problem (and it may very well be that it didn't exist before my D11972). I think the best fix is to pass the labels along with the context objects, so the low-level code that switches on the marker style to use (i.e. `simplemerge`) can do the formatting. This patch starts doing that by passing a fully-formatted label to `simplemerge`. A coming patch will move the formatting to `simplemerge`. Differential Revision: https://phab.mercurial-scm.org/D12013

     1

{

     2

    // Enforcing

     3

    "eqeqeq"        : true,     // true: Require triple equals (===) for comparison

     4

    "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()

     5

    "freeze"        : true,     // true: prohibits overwriting prototypes of native objects such as Array, Date etc.

     6

    "nonbsp"        : true,     // true: Prohibit "non-breaking whitespace" characters.

     7

    "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)

     8

     9

    // Environments

    10

    "browser"       : true      // Web Browser (window, document, etc)

    11

}