Show More
@@ -1556,6 +1556,9 b' def applyupdates(repo, actions, wctx, mc' | |||
|
1556 | 1556 | usemergedriver = not overwrite and mergeactions and ms.mergedriver |
|
1557 | 1557 | |
|
1558 | 1558 | if usemergedriver: |
|
1559 | if wctx.isinmemory(): | |
|
1560 | raise error.InMemoryMergeConflictsError("in-memory merge does not " | |
|
1561 | "support mergedriver") | |
|
1559 | 1562 | ms.commit() |
|
1560 | 1563 | proceed = driverpreprocess(repo, ms, wctx, labels=labels) |
|
1561 | 1564 | # the driver might leave some files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now