tests/test-pathconflicts-merge.t
changeset 35441 cf532a62e337
parent 35400 4441705b7111
child 35704 41ef02ba329b
equal deleted inserted replaced
35440:31d21309635b 35441: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]