hgbook
view en/examples/tour-merge-conflict.merge.out @ 327:b2a3175aad7a
added myself to the translators list
| author | jerojasro@localhost |
|---|---|
| date | Thu Oct 16 23:09:25 2008 -0500 (2008-10-16) |
| parents | 006bbad1f190 |
| children | 83790457e85b |
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 use 'hg resolve' to retry unresolved file merges
8 $ \textbf{cat letter.txt}
9 Greetings!
11 I am Shehu Musa Abacha, cousin to the former
12 =======
13 I am Alhaji Abba Abacha, son of the former
15 Nigerian dictator Sani Abacha.