hgbook
diff en/examples/tour-merge-conflict.merge.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
parents | 83790457e85b |
children |
line diff
1.1 --- a/en/examples/tour-merge-conflict.merge.out Sat Oct 18 12:07:16 2008 -0500 1.2 +++ b/en/examples/tour-merge-conflict.merge.out Thu Jan 29 22:47:34 2009 -0800 1.3 @@ -1,12 +1,12 @@ 1.4 $ \textbf{export HGMERGE=merge} 1.5 +$ \textbf{echo 'XXX this is broken and must be fixed'} 1.6 +XXX this is broken and must be fixed 1.7 $ \textbf{hg merge} 1.8 merging letter.txt 1.9 merge: warning: conflicts during merge 1.10 merging letter.txt failed! 1.11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 1.12 -There are unresolved merges, you can redo the full merge using: 1.13 - hg update -C 1 1.14 - hg merge 2 1.15 +use 'hg resolve' to retry unresolved file merges 1.16 $ \textbf{cat letter.txt} 1.17 Greetings! 1.18