--- a/tests/test-pathconflicts-merge.t	Tue Oct 24 11:14:38 2017 -0700
+++ b/tests/test-pathconflicts-merge.t	Tue Oct 24 11:15:30 2017 -0700
@@ -1,3 +1,11 @@
+Path conflict checking is currently disabled by default because of issue5716.
+Turn it on for this test.
+
+  $ cat >> $HGRCPATH << EOF
+  > [experimental]
+  > merge.checkpathconflicts=True
+  > EOF
+
   $ hg init repo
   $ cd repo
   $ echo base > base