tests/test-hgignore.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 1612 0d36e3d7e2ea
child 4443 4e521a3ee5eb
permissions -rw-r--r--
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

--
A dir/b.o
? a.c
? a.o
? dir/c.o
? syntax
--
abort: .hgignore: invalid pattern (relre): *.o
--
A dir/b.o
? .hgignore
? a.c
? syntax
--
.hgignore: 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