tests/test-symlink-os-yes-fs-no.py.out

commit: tidy up mergestate slightly

requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
updating working directory
4 files updated, 0 files merged, 0 files removed, 0 files unresolved