hgbook
diff it/examples/ch04-resolve.heads.it @ 1050:add323f1ff4e
1.6.2 finished,and first 2 paras of 1.6.3 refined
author | Zhaoping Sun <zhaopingsun@gmail.com> |
---|---|
date | Tue Nov 10 19:05:24 2009 -0500 (2009-11-10) |
parents | 3d5e63d5d180 |
children | 719b03ea27c8 |
line diff
1.1 --- a/it/examples/ch04-resolve.heads.it Tue Aug 11 21:53:03 2009 +0200 1.2 +++ b/it/examples/ch04-resolve.heads.it Tue Nov 10 19:05:24 2009 -0500 1.3 @@ -1,16 +1,16 @@ 1.4 <!-- BEGIN ch04/resolve.heads --> 1.5 <screen><prompt>$</prompt> <userinput>hg heads</userinput> 1.6 changeset: 2:6e8cd0b94b4c 1.7 -tag: tip 1.8 -parent: 0:05f41910a168 1.9 -user: Bryan O'Sullivan <bos@serpentine.com> 1.10 -date: Fri Jun 05 15:49:28 2009 +0000 1.11 -summary: destra 1.12 +etichetta: tip 1.13 +genitore: 0:05f41910a168 1.14 +utente: Bryan O'Sullivan <bos@serpentine.com> 1.15 +data: Fri Jun 05 15:49:28 2009 +0000 1.16 +sommario: destra 1.17 1.18 changeset: 1:ab0fbd8c502d 1.19 -user: Bryan O'Sullivan <bos@serpentine.com> 1.20 -date: Fri Jun 05 15:49:27 2009 +0000 1.21 -summary: sinistra 1.22 +utente: Bryan O'Sullivan <bos@serpentine.com> 1.23 +data: Fri Jun 05 15:49:27 2009 +0000 1.24 +sommario: sinistra 1.25 1.26 </screen> 1.27 <!-- END ch04/resolve.heads -->