hgbook

diff en/examples/results/tour.merge.tip.out @ 604:39b7a21c490b

Drop another dead file
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Mar 27 10:04:49 2009 -0700 (2009-03-27)
parents 44d1363234d2
children 4432ad34b8e5
line diff
     1.1 --- a/en/examples/results/tour.merge.tip.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/tour.merge.tip.out	Fri Mar 27 10:04:49 2009 -0700
     1.3 @@ -1,9 +1,10 @@
     1.4 -$ \textbf{hg tip}
     1.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput>
     1.6  changeset:   
     1.7  tag:         tip
     1.8  parent:      
     1.9  parent:      
    1.10 -user:        Bryan O'Sullivan <bos@serpentine.com>
    1.11 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.12  
    1.13  summary:     Merged changes
    1.14  
    1.15 +</screen>