Mercurial > hg

diff tests/test-pathconflicts-merge.t @ 35437:cf532a62e337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Augie Fackler <augie@google.com>
date Fri, 15 Dec 2017 17:52:38 -0500
parents 4441705b7111
children 41ef02ba329b
line wrap: on
line diff
--- 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.