##// END OF EJS Templates
filemerge: move check for identical sides out of filemerge()...
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
Martin von Zweigbergk -
r49604:93d6f0e7 default
Show More
Name Size Modified Last Commit Author
/ mercurial / testing
__init__.py Loading ...
revlog.py Loading ...
storage.py Loading ...