Mercurial > hg
view tests/test-mq-qfold.out @ 9241:d98cef25b5af
Merge with crew-stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 24 Jul 2009 15:28:29 +0200 |
parents | 561ff8d9e4f0 |
children | 296a0b14a686 |
line wrap: on
line source
% 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