Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlinks.out @ 1664:4338e33c973b
Safer version of FileMerge merge
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 30 Jan 2006 12:02:12 +1300 |
parents | 6c61646fee5e |
children | fd77b7ee4aac |
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