Mercurial > hg

diff mercurial/merge.py @ 18042:551e2901192e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix mistake in moved _checkcollision call from 5881d5b7552f
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 06 Dec 2012 22:07:44 -0600
parents 8b846dbc57b6
children 6c35b53cd28b
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Dec 06 16:56:44 2012 -0600
+++ b/mercurial/merge.py	Thu Dec 06 22:07:44 2012 -0600
@@ -458,7 +458,7 @@
             (force or not tctx.dirty(missing=True, branch=False))):
             _checkcollision(mctx, None)
         else:
-            _checkcollision(mctx, tctx)
+            _checkcollision(mctx, (tctx, ancestor))
     if not force:
         _checkunknown(repo, tctx, mctx)
     if tctx.rev() is None: