diff en/examples/ch04/resolve @ 995:56953b292c8a
finishing fixes on ch03 due to transformation from Latex files
author |
Romain PELISSE <belaran@gmail.com> |
date |
Sat Sep 12 17:58:26 2009 +0200 (2009-09-12) |
parents |
3b640272a966 |
children |
|
line diff
1.1 --- a/en/examples/ch04/resolve Sun Apr 12 00:05:30 2009 -0700
1.2 +++ b/en/examples/ch04/resolve Sat Sep 12 17:58:26 2009 +0200
1.3 @@ -26,7 +26,7 @@
1.4 hg heads
1.5
1.6 #$ name: export
1.7 -export HGMERGE=merge
1.8 +export HGMERGE=false
1.9
1.10 #$ name: merge
1.11 hg merge