hgbook

view it/examples/ch04-resolve.list.it @ 1113:613690ad6a9c

Merge with dongsheng
author Bryan O'Sullivan <bos@serpentine.com>
date Sat Jul 10 16:21:26 2010 +0100 (2010-07-10)
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 -->