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.