annotate en/examples/results/tour.merge.merge.out @ 614:c8680784cdbb
Make builds more reliable.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 15:35:44 2009 -0700 (2009-03-31) |
| parents |
0d5935744f87 |
| children |
|
| rev |
line source |
|
bos@611
|
1 <!-- BEGIN tour.merge.merge -->
|
|
bos@564
|
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
|
|
bos@144
|
3 merging hello.c
|
|
bos@144
|
4 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
5 (branch merge, don't forget to commit)
|
|
bos@564
|
6 </screen>
|
|
bos@611
|
7 <!-- END tour.merge.merge -->
|
