hgbook
diff it/examples/ch04-resolve.export.it @ 833:63ef1efbac57
Translate more code, matching repository names in figures.
author | gpiancastelli |
---|---|
date | Tue Aug 18 17:31:11 2009 +0200 (2009-08-18) |
parents | 3d5e63d5d180 |
children | 719b03ea27c8 |
line diff
1.1 --- a/it/examples/ch04-resolve.export.it Tue Aug 11 21:53:03 2009 +0200 1.2 +++ b/it/examples/ch04-resolve.export.it Tue Aug 18 17:31:11 2009 +0200 1.3 @@ -1,4 +1,4 @@ 1.4 <!-- BEGIN ch04/resolve.export --> 1.5 -<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput> 1.6 +<screen><prompt>$</prompt> <userinput>export HGMERGE=false</userinput> 1.7 </screen> 1.8 <!-- END ch04/resolve.export -->