changeset 8433 | 9a398dd53bcc |
parent 7627 | fb32ae9c76e7 |
child 9110 | 561ff8d9e4f0 |
--- a/tests/test-mq-merge.out Fri May 15 10:47:19 2009 +0200 +++ b/tests/test-mq-merge.out Fri May 15 15:21:17 2009 +0200 @@ -19,6 +19,5 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % merge merging with queue at refqueue -(working directory not at tip) applying patcha now at: patcha