--- a/tests/test-merge-criss-cross.t	Wed Feb 03 15:21:11 2016 +0000
+++ b/tests/test-merge-criss-cross.t	Tue Feb 02 15:24:11 2016 +0000
@@ -212,7 +212,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
-  $ hg up -qC
+  $ hg up -qC tip
   $ hg merge -v
   note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd