hgbook

diff en/examples/ch04/resolve @ 974:fb8c047cbc76

find changesets by author, revision, files, or words in the commit message
French translation: proof-reading appA-svn.xml, part 1
author Jean-Marie Clément <JeanMarieClement@web.de>
date Tue Sep 01 20:42:03 2009 +0200 (2009-09-01)
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	Tue Sep 01 20:42:03 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