hgbook

diff it/examples/tour-merge-conflict.pull.it @ 1050:add323f1ff4e

find changesets by author, revision, files, or words in the commit message
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 0bf0bf61493e
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/tour-merge-conflict.pull.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour-merge-conflict.pull.it	Tue Nov 10 19:05:24 2009 -0500
     1.3 @@ -5,7 +5,7 @@
     1.4  1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
     1.5  <prompt>$</prompt> <userinput>cd truffa-unione</userinput>
     1.6  <prompt>$</prompt> <userinput>hg pull -u ../truffa-figlio</userinput>
     1.7 -estraggo da ../scam-son
     1.8 +estraggo da ../truffa-figlio
     1.9  cerco i cambiamenti
    1.10  aggiungo i changeset
    1.11  aggiungo i manifest