tests/test-mq-qdelete.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 3374 b9a7c07fca0e
child 4722 487943b52a6c
permissions -rw-r--r--
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

adding base
abort: cannot delete applied patch c
Now at: b
a
b
a
b
series
status
Now at: a
a
b
series
status
1 New patch: a
0 base
abort: cannot delete revision 3 above applied patches
f
4 New patch: f
3 New patch: e
2 New patch: d
1 New patch: a
0 base