tests/test-mq-qfold.out
author Matt Mackall <mpm@selenic.com>
Tue, 29 Dec 2009 16:16:25 -0600
changeset 10155 df7fc77533fb
parent 9110 561ff8d9e4f0
child 10186 296a0b14a686
permissions -rw-r--r--
Merge with stable

% init
adding a
% fold in the middle of the queue
popping p3
popping p2
now at: p1
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
 a
+a
p1
p3
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
 a
+a
+b
% fold with local changes
abort: local changes found, refresh first
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
 a
+a
+b