hgbook

view it/examples/ch04-resolve.list.it @ 870:3a8e7acc026a

Merge
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Sep 10 14:52:11 2009 -0700 (2009-09-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 -->