Mercurial > hg

diff mercurial/merge.py @ 6740:b148e9099133

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use repo.changectx(None) to get a workingctx
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:46:29 -0500
parents 4b92591c69a7
children 1dca460e7d1e
line wrap: on
line diff
--- 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: