hgbook

diff en/examples/tour-merge-conflict.merge.out @ 554:91adcea08b33

find changesets by author, revision, files, or words in the commit message
Fix the bisect section, I hope (bisect is now part of Mercurial).
author Arne Babenhauserheide <bab@draketo.de>
date Wed Jan 21 14:16:38 2009 +0100 (2009-01-21)
parents 006bbad1f190
children 83790457e85b
line diff
     1.1 --- a/en/examples/tour-merge-conflict.merge.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/tour-merge-conflict.merge.out	Wed Jan 21 14:16:38 2009 +0100
     1.3 @@ -4,9 +4,7 @@
     1.4  merge: warning: conflicts during merge
     1.5  merging letter.txt failed!
     1.6  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
     1.7 -There are unresolved merges, you can redo the full merge using:
     1.8 -  hg update -C 1
     1.9 -  hg merge 2
    1.10 +use 'hg resolve' to retry unresolved file merges
    1.11  $ \textbf{cat letter.txt}
    1.12  Greetings!
    1.13