hgbook
annotate it/examples/ch04-resolve.list.it @ 1078:708f570346a9
2.4.1 some para zh translated
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Wed Nov 18 22:22:34 2009 -0500 (2009-11-18) |
| 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 --> |