view tests/test-symlinks.out @ 3869:ad6f34c83c3d

Add instructions how to redo/finish failed merge with local working directory.
b2ae81a7df29 already implemented this for branch merges.

adding foo
adding bomb
adding a.c
adding dir/a.o
adding dir/b.o
! a.c
! dir/a.o
! dir/b.o
? .hgignore
a.c: unsupported file type (type is fifo)
! a.c
# test absolute path through symlink outside repo
A f
# try symlink outside repo to file inside
abort: ../z not under root