Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-hgignore.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 | 91c0e8d7ddcf |
children | 0d36e3d7e2ea |
line wrap: on
line source
-- A dir/b.o ? a.c ? a.o ? dir/c.o ? syntax -- abort: invalid pattern: relre:*.o -- A dir/b.o ? .hgignore ? a.c ? syntax -- ignoring invalid syntax 'invalid' A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o ? syntax -- A dir/b.o ? .hgignore ? a.c ? syntax -- A dir/b.o ? .hgignore ? a.c ? a.o ? dir/c.o -- A dir/b.o -- A b.o