view .jshintrc @ 35463:ef7e667a4f7b

filemerge: only raise InMemoryMergeConflictsError when running _xmerge

The old code here was overly broad and would raise in cases when we didn't end
up calling `xmerge` and resolved using an internal tool (such as when
`premerge=True`).

Instead, let's swap out _xmerge if IMM is enabled and have the new tool raise
when called, which is the behavior we want.

Differential Revision: https://phab.mercurial-scm.org/D1739

{
    // Enforcing
    "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
    "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()
    "freeze"        : true,     // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
    "nonbsp"        : true,     // true: Prohibit "non-breaking whitespace" characters.
    "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)

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