filemerge: move check for identical sides out of filemerge() `filemerge.filemerge()` returns `None` if no merge was necessary because the two sides were identical. I don't think it should be that function's responsibility to handle that case; we should ideally not even call `filemerge.filemerge()` if the two inputs identical. This patch therefore moves the check out to the caller (`mergestate.py`). The largefiles test changed because we now notice that the two sides made the same change, so we don't consider it a merge. Also note that the new message better matches the line above it in the test output. Differential Revision: https://phab.mercurial-scm.org/D12154

     1

{

     2

    "conduit_uri": "https://phab.mercurial-scm.org/api",

     3

    "phabricator.uri": "https://phab.mercurial-scm.org/",

     4

    "repository.callsign": "HG",

     5

    "arc.land.onto.default": "@",

     6

    "base": "hg:.^"

     7

}