tests/test-mq-qrename.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 3080 82c9d1aac308
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
foo/renamed
renamed
bar/renamed
renamed
baz
.hg/patches/baz