annotate en/examples/results/issue29.go.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>hg init issue29</userinput>
|
|
bos@564
|
2 <prompt>$</prompt> <userinput>cd issue29</userinput>
|
|
bos@564
|
3 <prompt>$</prompt> <userinput>echo a > a</userinput>
|
|
bos@564
|
4 <prompt>$</prompt> <userinput>hg ci -Ama</userinput>
|
|
bos@156
|
5 adding a
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>echo b > b</userinput>
|
|
bos@564
|
7 <prompt>$</prompt> <userinput>hg ci -Amb</userinput>
|
|
bos@156
|
8 adding b
|
|
bos@564
|
9 <prompt>$</prompt> <userinput>hg up 0</userinput>
|
|
bos@156
|
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
bos@564
|
11 <prompt>$</prompt> <userinput>mkdir b</userinput>
|
|
bos@564
|
12 <prompt>$</prompt> <userinput>echo b > b/b</userinput>
|
|
bos@564
|
13 <prompt>$</prompt> <userinput>hg ci -Amc</userinput>
|
|
bos@156
|
14 adding b/b
|
|
hg@295
|
15 created new head
|
|
bos@564
|
16 <prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@156
|
17
|
|
bos@564
|
18 </screen>
|
