hgbook

view en/examples/tour-merge-conflict.merge.out @ 146:65f6f9d18fa1

find changesets by author, revision, files, or words in the commit message
Oops! I forgot that I need the undoctored output files in the book!
Now they're named "*.lxo", instead of "*.out". Ugh.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 06 21:55:48 2007 -0800 (2007-03-06)
parents
children e281bd9a8e47
line source
1 $ \textbf{export HGMERGE=merge}
2 $ \textbf{hg merge}
3 merging letter.txt
4 merge: warning: conflicts during merge
5 merging letter.txt failed!
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
7 There are unresolved merges, you can redo the full merge using:
8 hg update -C 1
9 hg merge 2
10 $ \textbf{cat letter.txt}
11 Greetings!
12
13 I am Shehu Musa Abacha, cousin to the former
14 =======
15 I am Alhaji Abba Abacha, son of the former
16
17 Nigerian dictator Sani Abacha.