hgbook

diff en/examples/tag.replace.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 4237e45506ee
children
line diff
     1.1 --- a/en/examples/tag.replace.out	Mon Apr 16 16:11:24 2007 -0700
     1.2 +++ b/en/examples/tag.replace.out	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -3,7 +3,7 @@
     1.4  tip                                
     1.5  v1.1                               
     1.6  $ \textbf{hg tag -r 2 v1.1}
     1.7 -abort: a tag named v1.1 already exists (use -f to force)
     1.8 +abort: tag 'v1.1' already exists (use -f to force)
     1.9  $ \textbf{hg tag -f -r 2 v1.1}
    1.10  $ \textbf{hg tags}
    1.11  tip