Mercurial > hgbook
comparison en/examples/results/tour.merge.clone.out @ 709:4432ad34b8e5
Check in example outputs with begin/end markers.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 31 Mar 2009 12:19:01 -0700 |
| parents | 0d5935744f87 |
| children |
comparison
equal
deleted
inserted
replaced
| 708:c82ff69f0935 | 709:4432ad34b8e5 |
|---|---|
| 1 <!-- BEGIN tour.merge.clone --> | |
| 1 <screen><prompt>$</prompt> <userinput>cd ..</userinput> | 2 <screen><prompt>$</prompt> <userinput>cd ..</userinput> |
| 2 <prompt>$</prompt> <userinput>hg clone hello my-new-hello</userinput> | 3 <prompt>$</prompt> <userinput>hg clone hello my-new-hello</userinput> |
| 3 updating working directory | 4 updating working directory |
| 4 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 5 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 5 <prompt>$</prompt> <userinput>cd my-new-hello</userinput> | 6 <prompt>$</prompt> <userinput>cd my-new-hello</userinput> |
| 6 <prompt>$</prompt> <userinput>sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c</userinput> | 7 <prompt>$</prompt> <userinput>sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c</userinput> |
| 7 <prompt>$</prompt> <userinput>hg commit -m 'A new hello for a new day.'</userinput> | 8 <prompt>$</prompt> <userinput>hg commit -m 'A new hello for a new day.'</userinput> |
| 8 </screen> | 9 </screen> |
| 10 <!-- END tour.merge.clone --> |