hgbook
diff it/examples/tour.merge.tip.it @ 791:bf84d6b2281c
Minor changes and translation of code snippets for Ch.7.
author | Giulio@puck |
---|---|
date | Tue Aug 11 23:01:30 2009 +0200 (2009-08-11) |
parents | |
children | 11a6ba60bb9e |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/it/examples/tour.merge.tip.it Tue Aug 11 23:01:30 2009 +0200 1.3 @@ -0,0 +1,12 @@ 1.4 +<!-- BEGIN tour.merge.tip --> 1.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput> 1.6 +changeset: 7:e300c3dcceca 1.7 +tag: tip 1.8 +parent: 5:1c343117a2e3 1.9 +parent: 6:764347e47e75 1.10 +user: Bryan O'Sullivan <bos@serpentine.com> 1.11 +date: Fri Jun 05 15:52:07 2009 +0000 1.12 +summary: Unisce i cambiamenti. 1.13 + 1.14 +</screen> 1.15 +<!-- END tour.merge.tip -->