##// END OF EJS Templates
mergestate: use an early return for trivial merges...
mergestate: use an early return for trivial merges `filemerge.filemerge()` returns `None` if no merge was needed because the two sides were identical. I'd like to move that to the caller. This is a little refactoring to prepare for that. Differential Revision: https://phab.mercurial-scm.org/D12153
Martin von Zweigbergk -
r49603:d169e651 default
Show More
Name Size Modified Last Commit Author
/ mercurial / testing
__init__.py Loading ...
revlog.py Loading ...
storage.py Loading ...