Mercurial > hgbook

diff en/examples/results/branching.merge.out @ 709:4432ad34b8e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/en/examples/results/branching.merge.out	Tue Mar 31 12:18:22 2009 -0700
+++ b/en/examples/results/branching.merge.out	Tue Mar 31 12:19:01 2009 -0700
@@ -1,3 +1,4 @@
+<!-- BEGIN branching.merge -->
 <screen><prompt>$</prompt> <userinput>cd ../main</userinput>
 <prompt>$</prompt> <userinput>hg pull ../stable</userinput>
 pulling from ../stable
@@ -16,3 +17,4 @@
 This is a fix to a boring feature.
 This is exciting and new!
 </screen>
+<!-- END branching.merge -->