hgbook
annotate en/examples/mq.tutorial.qrefresh.out @ 191:f078515438d2
Account for changed output.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Apr 16 14:39:20 2007 -0700 (2007-04-16) |
| parents | |
| children | 00f69e8825c5 |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{echo 'line 2' >> file1} |
| bos@144 | 2 $ \textbf{hg diff} |
| bos@144 | 3 diff -r file1 |
| bos@144 | 4 |
| bos@144 | 5 |
| bos@144 | 6 @@ -1,1 +1,2 @@ line 1 |
| bos@144 | 7 line 1 |
| bos@144 | 8 +line 2 |
| bos@144 | 9 $ \textbf{hg qrefresh} |
| bos@144 | 10 $ \textbf{hg diff} |
| bos@144 | 11 $ \textbf{hg tip --style=compact --patch} |
| bos@144 | 12 1[qtip,first.patch,tip,qbase] |
| bos@144 | 13 patch queue: first.patch |
| bos@144 | 14 |
| bos@144 | 15 diff -r -r file1 |
| bos@144 | 16 |
| bos@144 | 17 |
| bos@144 | 18 @@ -1,1 +1,2 @@ line 1 |
| bos@144 | 19 line 1 |
| bos@144 | 20 +line 2 |
| bos@144 | 21 |