view tests/test-symlinks.out @ 3400:d2b55e3c4e25

merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents 9d1c3529ebbc
children d7b9ec589546
line wrap: on
line source

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