Mercurial > hg

view tests/test-mq-qfold.out @ 8859:580a79dde2a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: web.encoding should override encoding.encoding (issue1183)
author Matt Mackall <mpm@selenic.com>
date Sat, 20 Jun 2009 13:00:25 -0500
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