hgbook
annotate en/examples/results/mq.tutorial.qrefresh.out @ 580:8366882f67f2
Fix up more formatting goop
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed Mar 18 00:00:58 2009 -0700 (2009-03-18) |
| parents | 44d1363234d2 |
| children | 4432ad34b8e5 |
| rev | line source |
|---|---|
| bos@564 | 1 <screen><prompt>$</prompt> <userinput>echo 'line 2' >> file1</userinput> |
| bos@564 | 2 <prompt>$</prompt> <userinput>hg diff</userinput> |
| bos@144 | 3 diff -r file1 |
| bos@144 | 4 |
| bos@144 | 5 |
| hg@297 | 6 @@ -1,1 +1,2 @@ |
| bos@144 | 7 line 1 |
| bos@144 | 8 +line 2 |
| bos@564 | 9 <prompt>$</prompt> <userinput>hg qrefresh</userinput> |
| bos@564 | 10 <prompt>$</prompt> <userinput>hg diff</userinput> |
| bos@564 | 11 <prompt>$</prompt> <userinput>hg tip --style=compact --patch</userinput> |
| bos@564 | 12 1[qtip,first.patch,tip,qbase] 2009-03-10 04:38 +0000 bos |
| bos@273 | 13 [mq]: first.patch |
| bos@144 | 14 |
| bos@144 | 15 diff -r -r file1 |
| bos@144 | 16 |
| bos@144 | 17 |
| hg@297 | 18 @@ -1,1 +1,2 @@ |
| bos@144 | 19 line 1 |
| bos@144 | 20 +line 2 |
| bos@144 | 21 |
| bos@564 | 22 </screen> |