hgbook

view it/examples/ch04-resolve.list.it @ 996:6f8c48362758

merge with trunk
author Romain PELISSE <belaran@gmail.com>
date Sat Sep 12 17:58:56 2009 +0200 (2009-09-12)
parents
children
line source
1 <!-- BEGIN ch04/resolve.list -->
2 <screen><prompt>$</prompt> <userinput>hg resolve -l</userinput>
3 U miofile.txt
4 </screen>
5 <!-- END ch04/resolve.list -->