( )⚙ D12153 mergestate: use an early return for trivial merges

This is an archive of the discontinued Mercurial Phabricator instance.

mergestate: use an early return for trivial merges
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.