Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlinks.out @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Dec 2005 22:19:03 -0600 |
parents | c13fce7167c2 |
children | 6c61646fee5e |
line wrap: on
line source
adding foo adding bomb adding a.c adding dir/a.o adding dir/b.o R a.c R dir/a.o R dir/b.o ? .hgignore a.c: unsupported file type (type is fifo) R a.c