--- a/tests/test-pathconflicts-merge.t Thu Dec 14 14:31:57 2017 +0000
+++ b/tests/test-pathconflicts-merge.t Fri Dec 15 17:52:38 2017 -0500
@@ -1,3 +1,5 @@
+#require symlink
+
Path conflict checking is currently disabled by default because of issue5716.
Turn it on for this test.