Mercurial > hgbook

diff en/examples/results/branch-repo.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/branch-repo.merge.out	Tue Mar 31 12:18:22 2009 -0700
+++ b/en/examples/results/branch-repo.merge.out	Tue Mar 31 12:19:01 2009 -0700
@@ -1,3 +1,4 @@
+<!-- BEGIN branch-repo.merge -->
 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
@@ -10,3 +11,4 @@
 adding file changes
 added 2 changesets with 1 changes to 1 files
 </screen>
+<!-- END branch-repo.merge -->