diff -r 0134d839444b -r 20bac46f7744 tests/test-commandserver.t --- a/tests/test-commandserver.t Tue Aug 01 21:03:25 2017 +0900 +++ b/tests/test-commandserver.t Wed Jul 26 22:10:15 2017 +0900 @@ -956,10 +956,9 @@ *** runcommand up -qC 2 *** runcommand up -qC 1 *** runcommand merge 2 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) + abort: path 'a/poisoned' traverses symbolic link 'a' + [255] $ ls ../merge-symlink-out - poisoned cache of repo.auditor should be discarded, so matcher would never traverse symlinks: @@ -983,7 +982,8 @@ *** runcommand up -qC 0 *** runcommand up -qC 1 *** runcommand files a/poisoned - [1] + abort: path 'a/poisoned' traverses symbolic link 'a' + [255] $ cd ..