Submitter | phabricator |
---|---|
Date | May 19, 2020, 7:53 p.m. |
Message ID | <differential-rev-PHID-DREV-57grqzeq2jht5hyqj3dj-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/46362/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1367,10 +1367,6 @@ usemergedriver = not overwrite and mergeactions and ms.mergedriver if usemergedriver: - if wctx.isinmemory(): - raise error.InMemoryMergeConflictsError( - b"in-memory merge does not support mergedriver" - ) ms.commit() proceed = driverpreprocess(repo, ms, wctx, labels=labels) # the driver might leave some files unresolved