Mercurial > hgbook
diff en/examples/results/tour-merge-conflict.wife.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 |
line wrap: on
line diff
--- a/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:18:22 2009 -0700 +++ b/en/examples/results/tour-merge-conflict.wife.out Tue Mar 31 12:19:01 2009 -0700 @@ -1,3 +1,4 @@ +<!-- BEGIN tour-merge-conflict.wife --> <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput> <prompt>></prompt> <userinput>Greetings!</userinput> <prompt>></prompt> <userinput>I am Mariam Abacha, the wife of former</userinput> @@ -6,3 +7,4 @@ <prompt>$</prompt> <userinput>hg add letter.txt</userinput> <prompt>$</prompt> <userinput>hg commit -m '419 scam, first draft'</userinput> </screen> +<!-- END tour-merge-conflict.wife -->