From patchwork Fri Dec 15 23:06:19 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D1710: tests: test-pathconflicts-merge.t requires symlinks
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 26325
Message-Id: <5d53ba282e93d70dcb30d5597cb693df@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Fri, 15 Dec 2017 23:06:19 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf7de3353e59d: tests: test-pathconflicts-merge.t requires symlinks (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1710?vs=4520&id=4521

REVISION DETAIL
  https://phab.mercurial-scm.org/D1710

AFFECTED FILES
  tests/test-pathconflicts-merge.t

CHANGE DETAILS




To: durin42, #hg-reviewers, krbullock
Cc: krbullock, mercurial-devel

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.