--- a/mercurial/merge.py	Wed Jun 25 17:35:20 2008 -0500
+++ b/mercurial/merge.py	Thu Jun 26 13:46:29 2008 -0500
@@ -409,7 +409,7 @@
 
     wlock = repo.wlock()
     try:
-        wc = repo.workingctx()
+        wc = repo.changectx(None)
         if node is None:
             # tip of current branch
             try: