tests/test-symlinks.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 01 Feb 2006 08:46:24 +0100
changeset 1674 dee55c4a4963
parent 1620 6c61646fee5e
child 2115 fd77b7ee4aac
permissions -rw-r--r--
abort when using 'update -m' and this is not a merge add more testcases for updating with local changes

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