hgbook
annotate it/examples/tour-merge-conflict.commit.it @ 977:719b03ea27c8
merge with Italian, and very (few) work on ch03
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 16:33:46 2009 +0200 (2009-09-04) |
| parents | 713f0f69029a 11a6ba60bb9e |
| children |
| rev | line source |
|---|---|
| Giulio@785 | 1 <!-- BEGIN tour-merge-conflict.commit --> |
| Giulio@785 | 2 <screen><prompt>$</prompt> <userinput>cat > lettera.txt <<EOF</userinput> |
| Giulio@785 | 3 <prompt>></prompt> <userinput>Salve!</userinput> |
| Giulio@785 | 4 <prompt>></prompt> <userinput>Sono Bryan O'Sullivan, nessuna parentela con l'ex</userinput> |
| Giulio@785 | 5 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput> |
| Giulio@785 | 6 <prompt>></prompt> <userinput>EOF</userinput> |
| Giulio@785 | 7 <prompt>$</prompt> <userinput>hg resolve -m lettera.txt</userinput> |
| Giulio@785 | 8 <prompt>$</prompt> <userinput>hg commit -m 'Mandatemi i vostri soldi'</userinput> |
| Giulio@785 | 9 <prompt>$</prompt> <userinput>hg tip</userinput> |
| Giulio@785 | 10 changeset: 3:df19ae0ef4d4 |
| gpiancastelli@836 | 11 etichetta: tip |
| gpiancastelli@836 | 12 genitore: 1:ae14113af250 |
| gpiancastelli@836 | 13 genitore: 2:11ab3b2b6d1b |
| gpiancastelli@836 | 14 utente: Bryan O'Sullivan <bos@serpentine.com> |
| gpiancastelli@836 | 15 data: Fri Jun 05 15:52:13 2009 +0000 |
| gpiancastelli@836 | 16 sommario: Mandatemi i vostri soldi |
| Giulio@785 | 17 |
| Giulio@785 | 18 </screen> |
| Giulio@785 | 19 <!-- END tour-merge-conflict.commit --> |