--- a/tests/test-merge-criss-cross.t	Wed Apr 30 16:56:23 2014 -0700
+++ b/tests/test-merge-criss-cross.t	Wed Oct 01 03:40:51 2014 +0200
@@ -349,7 +349,7 @@
   2
   $ hg log -r 'ancestor(head())' --config merge.preferancestor=3 -T '{rev}\n'
   1
-  $ hg log -r 'ancestor(head())' --config merge.preferancestor='*' -T '{rev}\n'
-  1
+  $ hg log -r 'ancestor(head())' --config merge.preferancestor='1337 * - 2' -T '{rev}\n'
+  2
 
   $ cd ..