hgbook
view en/examples/mq.tutorial.qrefresh.out @ 199:58e3a6c76725
More branch/merge stuff.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Apr 16 17:37:27 2007 -0700 (2007-04-16) |
| parents | |
| children | 00f69e8825c5 |
line source
1 $ \textbf{echo 'line 2' >> file1}
2 $ \textbf{hg diff}
3 diff -r file1
6 @@ -1,1 +1,2 @@ line 1
7 line 1
8 +line 2
9 $ \textbf{hg qrefresh}
10 $ \textbf{hg diff}
11 $ \textbf{hg tip --style=compact --patch}
12 1[qtip,first.patch,tip,qbase]
13 patch queue: first.patch
15 diff -r -r file1
18 @@ -1,1 +1,2 @@ line 1
19 line 1
20 +line 2