author | Kevin Bullock <kbullock@ringworld.org> |
Thu, 06 Dec 2012 22:07:44 -0600 | |
changeset 18042 | 551e2901192e |
parent 18041 | f0cfa27c712a |
child 18043 | 20459152c7ac |
--- 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: