mercurial/merge.py
changeset 35500 87918218da70
parent 35288 5db3c748ce8f
child 35726 45b678bf3a78
--- a/mercurial/merge.py	Tue Dec 26 22:56:07 2017 +0530
+++ b/mercurial/merge.py	Wed Dec 27 13:53:21 2017 -0600
@@ -1556,6 +1556,9 @@
     usemergedriver = not overwrite and mergeactions and ms.mergedriver
 
     if usemergedriver:
+        if wctx.isinmemory():
+            raise error.InMemoryMergeConflictsError("in-memory merge does not "
+                                                    "support mergedriver")
         ms.commit()
         proceed = driverpreprocess(repo, ms, wctx, labels=labels)
         # the driver might leave some files unresolved