Mercurial > hg

view tests/test-mq-qfold.out @ 9574:9e9f63d5c456

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
encoding: fix issue with non-standard UTF-8 CTYPE on OS X
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 10 Oct 2009 12:00:43 +0200
parents 2ff17c4de1da
children 561ff8d9e4f0
line wrap: on
line source

% 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