diff --git a/tests/test-mq-merge.out b/tests/test-mq-merge.out new file mode 100644 --- /dev/null +++ b/tests/test-mq-merge.out @@ -0,0 +1,11 @@ +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 +a +b +merging with queue at: .hg/patches.1 +applying rm_a +Now at: rm_a +b