hgbook

diff it/examples/ch04-resolve.list.it @ 791:bf84d6b2281c

find changesets by author, revision, files, or words in the commit message
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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/ch04-resolve.list.it	Tue Aug 11 23:01:30 2009 +0200
     1.3 @@ -0,0 +1,5 @@
     1.4 +<!-- BEGIN ch04/resolve.list -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg resolve -l</userinput>
     1.6 +U miofile.txt
     1.7 +</screen>
     1.8 +<!-- END ch04/resolve.list -->