hgbook

diff en/examples/results/tour.merge.cat.out @ 611:4432ad34b8e5

find changesets by author, revision, files, or words in the commit message
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 12:19:01 2009 -0700 (2009-03-31)
parents 0d5935744f87
children
line diff
     1.1 --- a/en/examples/results/tour.merge.cat.out	Mon Mar 09 21:39:23 2009 -0700
     1.2 +++ b/en/examples/results/tour.merge.cat.out	Tue Mar 31 12:19:01 2009 -0700
     1.3 @@ -1,3 +1,4 @@
     1.4 +<!-- BEGIN tour.merge.cat -->
     1.5  <screen><prompt>$</prompt> <userinput>cat hello.c</userinput>
     1.6  /*
     1.7   * Placed in the public domain by Bryan O'Sullivan.  This program is
     1.8 @@ -27,3 +28,4 @@
     1.9  	return 0;
    1.10  }
    1.11  </screen>
    1.12 +<!-- END tour.merge.cat -->