branch | stable |
changeset 10775 | c52057614c72 |
parent 10397 | 8cb81d75730c |
--- a/tests/test-mq-merge.out Fri Mar 26 17:02:49 2010 +0100 +++ b/tests/test-mq-merge.out Wed Mar 24 01:43:24 2010 +0100 @@ -1,12 +1,10 @@ adding a adding b -copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b created new head a b -merging with queue at: .hg/patches.1 applying rm_a now at: rm_a b