hgbook
diff it/examples/ch04-resolve.list.it @ 1024:ea04ebd452b5
French : second part of ch06
author | André Sintzoff <andre.sintzoff@gmail.com> |
---|---|
date | Thu Dec 03 22:45:38 2009 +0100 (2009-12-03) |
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 Thu Dec 03 22:45:38 2009 +0100 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 -->