Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 20595:710c2755e66a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Feb 2014 18:57:03 -0600
parents e0e223b0a506 ba619c50a355
children a3ca1d032926
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Feb 13 09:18:16 2014 -0800
+++ b/mercurial/commands.py	Thu Feb 27 18:57:03 2014 -0600
@@ -4954,7 +4954,6 @@
                 ms.mark(f, "u")
             else:
                 wctx = repo[None]
-                mctx = wctx.parents()[-1]
 
                 # backup pre-resolve (merge uses .orig for its own purposes)
                 a = repo.wjoin(f)
@@ -4963,7 +4962,7 @@
                 try:
                     # resolve file
                     ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
-                    if ms.resolve(f, wctx, mctx):
+                    if ms.resolve(f, wctx):
                         ret = 1
                 finally:
                     ui.setconfig('ui', 'forcemerge', '')