# HG changeset patch
# User Dale Glass <dale@daleglass.net>
# Date 1250194929 25200
# Node ID f3a4e6040421e7df023f9c70077ad5088b28c8a5
# Parent  5225ec140003740b7b4bf745bc901276f6dc7c48
Fix chapter 4 HGMERGE line

diff -r 5225ec140003 -r f3a4e6040421 en/examples/ch04/resolve
--- a/en/examples/ch04/resolve	Thu May 14 21:06:12 2009 -0700
+++ b/en/examples/ch04/resolve	Thu Aug 13 13:22:09 2009 -0700
@@ -26,7 +26,7 @@
 hg heads
 
 #$ name: export
-export HGMERGE=merge
+export HGMERGE=false
 
 #$ name: merge
 hg merge