tests/test-mq-qfold.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 18 May 2009 22:55:45 +0200
changeset 8495 5b7596b142ad
parent 8426 2ff17c4de1da
child 9110 561ff8d9e4f0
permissions -rw-r--r--
convert: directly use nullid

% init
adding a
% fold in the middle of the queue
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