Mercurial > hg
annotate tests/test-mq-qfold.out @ 9403:3738c8cff1bf
test-keyword: update output to match 5d49fdef6fd0
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 27 Aug 2009 00:00:15 +0200 |
parents | 2ff17c4de1da |
children | 561ff8d9e4f0 |
rev | line source |
---|---|
8426 | 1 % init |
2 adding a | |
3 % fold in the middle of the queue | |
4 now at: p1 | |
5 --- a/a | |
6 +++ b/a | |
7 @@ -1,1 +1,2 @@ | |
8 a | |
9 +a | |
10 p1 | |
11 p3 | |
12 --- a/a | |
13 +++ b/a | |
14 @@ -1,1 +1,3 @@ | |
15 a | |
16 +a | |
17 +b | |
18 % fold with local changes | |
19 abort: local changes found, refresh first | |
20 --- a/a | |
21 +++ b/a | |
22 @@ -1,1 +1,3 @@ | |
23 a | |
24 +a | |
25 +b |