Commits

Anonymous committed f3a4e60

Fix chapter 4 HGMERGE line

Comments (0)

Files changed (1)

en/examples/ch04/resolve

 hg heads
 
 #$ name: export
-export HGMERGE=merge
+export HGMERGE=false
 
 #$ name: merge
 hg merge