# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1354853264 21600
# Node ID 551e2901192e7a499baad81892ac4bb3e981f673
# Parent  f0cfa27c712a770f39adcbe6aca7af322e1cc55e
merge: fix mistake in moved _checkcollision call from 5881d5b7552f

diff -r f0cfa27c712a -r 551e2901192e mercurial/merge.py
--- 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: