##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge with crew
merge with crew
Patrick Mezard - - Load All Authors

File last commit:

r8426:2ff17c4d default
r8602:b26aaf13 merge default
Show More
test-mq-qfold.out
25 lines | 255 B | text/plain | TextLexer
/ tests / test-mq-qfold.out
History | Annotation | Raw |Copy content |Copy permalink
% 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