hgbook

diff en/examples/tour-merge-conflict @ 586:abd5d0c1def9

find changesets by author, revision, files, or words in the commit message
Ignore more
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Mar 19 22:42:14 2009 -0700 (2009-03-19)
parents e281bd9a8e47
children 4e23c220d1b0
line diff
     1.1 --- a/en/examples/tour-merge-conflict	Wed Aug 20 22:00:46 2008 +0200
     1.2 +++ b/en/examples/tour-merge-conflict	Thu Mar 19 22:42:14 2009 -0700
     1.3 @@ -56,6 +56,7 @@
     1.4  #$ ignore: [<>]{7} /tmp/.*
     1.5  
     1.6  export HGMERGE=merge
     1.7 +echo 'XXX this is broken and must be fixed'
     1.8  hg merge
     1.9  cat letter.txt
    1.10