hgbook
view en/examples/tour-merge-conflict.merge.out @ 379:dbc78b312fc0
finished translation of tour-basic
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Mon Oct 27 23:29:24 2008 -0500 (2008-10-27) |
| parents | e281bd9a8e47 |
| children | bc14f94e726a |
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!
13 I am Shehu Musa Abacha, cousin to the former
14 =======
15 I am Alhaji Abba Abacha, son of the former
17 Nigerian dictator Sani Abacha.