Skip to content
Snippets Groups Projects
Commit d169e651 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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
parent 7dad4665
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment