Mercurial > hg
comparison tests/test-pathconflicts-merge.t @ 35437:cf532a62e337
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 |
comparison
equal
deleted
inserted
replaced
| 35436:31d21309635b | 35437:cf532a62e337 |
|---|---|
| 1 #require symlink | |
| 2 | |
| 1 Path conflict checking is currently disabled by default because of issue5716. | 3 Path conflict checking is currently disabled by default because of issue5716. |
| 2 Turn it on for this test. | 4 Turn it on for this test. |
| 3 | 5 |
| 4 $ cat >> $HGRCPATH << EOF | 6 $ cat >> $HGRCPATH << EOF |
| 5 > [experimental] | 7 > [experimental] |