hgbook

diff en/examples/ch04/resolve @ 1024:ea04ebd452b5

find changesets by author, revision, files, or words in the commit message
French : second part of ch06
author André Sintzoff <andre.sintzoff@gmail.com>
date Thu Dec 03 22:45:38 2009 +0100 (2009-12-03)
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	Thu Dec 03 22:45:38 2009 +0100
     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