Mercurial > hg
comparison .hgsigs @ 48759:d169e651066b
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
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 07 Feb 2022 20:12:09 -0800 |
parents | 01fde63b4ede |
children | b84ff512b645 |
comparison
equal
deleted
inserted
replaced
48758:7dad4665d223 | 48759:d169e651066b |
---|