hgbook
annotate en/examples/mq.tutorial.qrefresh2.out @ 275:96ea24a916f9
Merge with myself.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Nov 26 20:42:36 2007 -0800 (2007-11-26) |
| parents | 006bbad1f190 |
| children | bd8d96d3703d |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{echo 'line 3' >> file1} |
| bos@144 | 2 $ \textbf{hg status} |
| bos@144 | 3 M file1 |
| bos@144 | 4 $ \textbf{hg qrefresh} |
| bos@144 | 5 $ \textbf{hg tip --style=compact --patch} |
| bos@144 | 6 1[qtip,first.patch,tip,qbase] |
| bos@273 | 7 [mq]: first.patch |
| bos@144 | 8 |
| bos@144 | 9 diff -r -r file1 |
| bos@144 | 10 |
| bos@144 | 11 |
| bos@144 | 12 @@ -1,1 +1,3 @@ line 1 |
| bos@144 | 13 line 1 |
| bos@144 | 14 +line 2 |
| bos@144 | 15 +line 3 |
| bos@144 | 16 |