hgbook

annotate it/examples/ch04-resolve.list.it @ 917:93154fbaae9b

Merge with http://bitbucket.org/dukebody/hgbook-alqua/
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Oct 27 21:31:06 2009 -0700 (2009-10-27)
parents
children
rev   line source
Giulio@790 1 <!-- BEGIN ch04/resolve.list -->
Giulio@790 2 <screen><prompt>$</prompt> <userinput>hg resolve -l</userinput>
Giulio@790 3 U miofile.txt
Giulio@790 4 </screen>
Giulio@790 5 <!-- END ch04/resolve.list -->