Mercurial > hgbook
comparison en/examples/results/branching.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 branching.merge --> | |
1 <screen><prompt>$</prompt> <userinput>cd ../main</userinput> | 2 <screen><prompt>$</prompt> <userinput>cd ../main</userinput> |
2 <prompt>$</prompt> <userinput>hg pull ../stable</userinput> | 3 <prompt>$</prompt> <userinput>hg pull ../stable</userinput> |
3 pulling from ../stable | 4 pulling from ../stable |
4 searching for changes | 5 searching for changes |
5 adding changesets | 6 adding changesets |
14 <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput> | 15 <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput> |
15 <prompt>$</prompt> <userinput>cat myfile</userinput> | 16 <prompt>$</prompt> <userinput>cat myfile</userinput> |
16 This is a fix to a boring feature. | 17 This is a fix to a boring feature. |
17 This is exciting and new! | 18 This is exciting and new! |
18 </screen> | 19 </screen> |
20 <!-- END branching.merge --> |