hgbook

view it/examples/tour-merge-conflict.commit.it @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun Dec 13 16:35:56 2009 +0900 (2009-12-13)
parents 713f0f69029a 11a6ba60bb9e
children
line source
1 <!-- BEGIN tour-merge-conflict.commit -->
2 <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
3 <prompt>></prompt> <userinput>Salve!</userinput>
4 <prompt>></prompt> <userinput>Sono Bryan O'Sullivan, nessuna parentela con l'ex</userinput>
5 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
6 <prompt>></prompt> <userinput>EOF</userinput>
7 <prompt>$</prompt> <userinput>hg resolve -m lettera.txt</userinput>
8 <prompt>$</prompt> <userinput>hg commit -m 'Mandatemi i vostri soldi'</userinput>
9 <prompt>$</prompt> <userinput>hg tip</userinput>
10 changeset: 3:df19ae0ef4d4
11 etichetta: tip
12 genitore: 1:ae14113af250
13 genitore: 2:11ab3b2b6d1b
14 utente: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
15 data: Fri Jun 05 15:52:13 2009 +0000
16 sommario: Mandatemi i vostri soldi
17
18 </screen>
19 <!-- END tour-merge-conflict.commit -->