tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Mon, 25 Jun 2007 15:57:01 -0700
changeset 4722 487943b52a6c
parent 3592 fffc8a733bf9
permissions -rw-r--r--
mq: regularize patch header creation. Do not prefix qnew patches with [mq]: when a message has been given. Always use [mq]: as the prefix for generated commit messages.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes