Mercurial > hgbook
comparison en/examples/results/tour.merge.merge.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.merge --> | |
1 <screen><prompt>$</prompt> <userinput>hg merge</userinput> | 2 <screen><prompt>$</prompt> <userinput>hg merge</userinput> |
2 merging hello.c | 3 merging hello.c |
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 4 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
4 (branch merge, don't forget to commit) | 5 (branch merge, don't forget to commit) |
5 </screen> | 6 </screen> |
7 <!-- END tour.merge.merge --> |