hgbook
diff en/examples/results/tour-merge-conflict.commit.out @ 611:4432ad34b8e5
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-conflict.commit.out Mon Mar 09 21:39:23 2009 -0700 1.2 +++ b/en/examples/results/tour-merge-conflict.commit.out Tue Mar 31 12:19:01 2009 -0700 1.3 @@ -1,3 +1,4 @@ 1.4 +<!-- BEGIN tour-merge-conflict.commit --> 1.5 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> 1.6 <prompt>></prompt> <userinput>Greetings!</userinput> 1.7 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput> 1.8 @@ -15,3 +16,4 @@ 1.9 summary: Send me your money 1.10 1.11 </screen> 1.12 +<!-- END tour-merge-conflict.commit -->