hgbook

diff en/examples/bisect.help.out @ 302:e281bd9a8e47

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:00:46 2008 +0200 (2008-08-20)
parents 0a20b03559bf
children 303d1576da77
line diff
     1.1 --- a/en/examples/bisect.help.out	Sat May 26 12:07:03 2007 -0700
     1.2 +++ b/en/examples/bisect.help.out	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -24,6 +24,3 @@
     1.4  
     1.5  
     1.6  
     1.7 -
     1.8 -
     1.9 -