Mercurial > hg-stable

diff tests/test-mq-merge.out @ 6628:f18f14bae172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-mq-merge: test mq merge and explicit patch queue
author Patrick Mezard <pmezard@gmail.com>
date Sat, 24 May 2008 18:11:34 +0200
parents 4b0c9c674707
children fb32ae9c76e7
line wrap: on
line diff
--- a/tests/test-mq-merge.out	Thu May 08 14:02:42 2008 +1000
+++ b/tests/test-mq-merge.out	Sat May 24 18:11:34 2008 +0200
@@ -11,3 +11,14 @@
 Now at: rm_a
 b
 Patch queue now empty
+
+% init t2
+adding a
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% create the reference queue
+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