hgbook

diff en/examples/results/tour-merge-conflict.cousin.out @ 614:c8680784cdbb

find changesets by author, revision, files, or words in the commit message
Make builds more reliable.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 15:35:44 2009 -0700 (2009-03-31)
parents 0d5935744f87
children
line diff
     1.1 --- a/en/examples/results/tour-merge-conflict.cousin.out	Mon Mar 09 21:39:23 2009 -0700
     1.2 +++ b/en/examples/results/tour-merge-conflict.cousin.out	Tue Mar 31 15:35:44 2009 -0700
     1.3 @@ -1,3 +1,4 @@
     1.4 +<!-- BEGIN tour-merge-conflict.cousin -->
     1.5  <screen><prompt>$</prompt> <userinput>cd ..</userinput>
     1.6  <prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
     1.7  updating working directory
     1.8 @@ -10,3 +11,4 @@
     1.9  <prompt>></prompt> <userinput>EOF</userinput>
    1.10  <prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
    1.11  </screen>
    1.12 +<!-- END tour-merge-conflict.cousin -->