comparison hgext/lfs/blobstore.py @ 45549:e9468f14379a

rebase: move check for unresolved conflicts into lower-level rebasenode() I want to add another call to `rebasenode()` and it's better to not have to duplicate the check. Differential Revision: https://phab.mercurial-scm.org/D9075
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 23 Sep 2020 09:04:32 -0700
parents 234001d22ba6
children 89a2afe31e82
comparison
equal deleted inserted replaced
45548:25e365d5aa8f 45549:e9468f14379a