changeset 7627 | fb32ae9c76e7 |
parent 6628 | f18f14bae172 |
child 8433 | 9a398dd53bcc |
--- a/tests/test-mq-merge.out Sat Jan 03 17:15:21 2009 +0100 +++ b/tests/test-mq-merge.out Sat Jan 03 17:15:21 2009 +0100 @@ -8,9 +8,9 @@ b merging with queue at: .hg/patches.1 applying rm_a -Now at: rm_a +now at: rm_a b -Patch queue now empty +patch queue now empty % init t2 adding a @@ -21,4 +21,4 @@ merging with queue at refqueue (working directory not at tip) applying patcha -Now at: patcha +now at: patcha