# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2017-12-15 22:52:38
# Node ID cf532a62e337645e949da9529c41ff1a5ab4d981
# Parent  31d21309635b1435513ec6a47da2a4ff5e4225a5

tests: test-pathconflicts-merge.t requires symlinks

Once we're ready to turn this functionality on more widely, we might
want to write a symlink-free version of the test that can run on
Windows, but for now we'll just leave it disabled there.

Differential Revision: https://phab.mercurial-scm.org/D1710

diff --git a/tests/test-pathconflicts-merge.t b/tests/test-pathconflicts-merge.t
--- a/tests/test-pathconflicts-merge.t
+++ b/tests/test-pathconflicts-merge.t
@@ -1,3 +1,5 @@
+#require symlink
+
 Path conflict checking is currently disabled by default because of issue5716.
 Turn it on for this test.