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

Our full contribution guidelines are in our wiki, please see:

     2

     3

https://www.mercurial-scm.org/wiki/ContributingChanges

     4

     5

If you just want a checklist to follow, you can go straight to

     6

     7

https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist

     8

     9

If you can't run the entire testsuite for some reason (it can be

    10

difficult on Windows), please at least run `contrib/check-code.py` on

    11

any files you've modified and run `python contrib/check-commit` on any

    12

commits you've made (for example, `python contrib/check-commit

    13

273ce12ad8f1` will report some style violations on a very old commit).