hgbook

diff en/examples/tour.merge.tip.out @ 432:5da084395a69

translated some other paragrpahs
author jerojasro@localhost
date Sun Nov 30 18:55:34 2008 -0500 (2008-11-30)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/tour.merge.tip.out	Sun Nov 30 18:55:34 2008 -0500
     1.3 @@ -0,0 +1,9 @@
     1.4 +$ \textbf{hg tip}
     1.5 +changeset:   
     1.6 +tag:         tip
     1.7 +parent:      
     1.8 +parent:      
     1.9 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.10 +
    1.11 +summary:     Merged changes
    1.12 +