hgbook

changeset 707:f3a4e6040421

find changesets by author, revision, files, or words in the commit message
Fix chapter 4 HGMERGE line
author Dale Glass <dale@daleglass.net>
date Thu Aug 13 13:22:09 2009 -0700 (2009-08-13)
parents 5225ec140003
children f9f71850ae1a
files en/examples/ch04/resolve
line diff
     1.1 --- a/en/examples/ch04/resolve	Thu May 14 21:06:12 2009 -0700
     1.2 +++ b/en/examples/ch04/resolve	Thu Aug 13 13:22:09 2009 -0700
     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