diff tests/test-mq-merge.out @ 10775:c52057614c72 stable

Tests with spaces in paths This allows most tests to succeed with ./run-tests.py --tmpdir='/tmp/hg test' and introduces other tests for spaces and shell quoting
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 24 Mar 2010 01:43:24 +0100
parents 8cb81d75730c
children
line wrap: on
line diff
--- 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