hgbook
annotate ja/examples/tour-merge-conflict.merge.out @ 988:72de97557f11
French translation : 75% of ch05-daily translated
author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
---|---|
date | Thu Sep 10 01:08:16 2009 +0200 (2009-09-10) |
parents | |
children |
rev | line source |
---|---|
foozy@708 | 1 $ \textbf{export HGMERGE=merge} |
foozy@708 | 2 $ \textbf{hg merge} |
foozy@708 | 3 merging letter.txt |
foozy@708 | 4 merge: warning: conflicts during merge |
foozy@708 | 5 merging letter.txt failed! |
foozy@708 | 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
foozy@708 | 7 There are unresolved merges, you can redo the full merge using: |
foozy@708 | 8 hg update -C 1 |
foozy@708 | 9 hg merge 2 |
foozy@708 | 10 $ \textbf{cat letter.txt} |
foozy@708 | 11 Greetings! |
foozy@708 | 12 |
foozy@708 | 13 I am Shehu Musa Abacha, cousin to the former |
foozy@708 | 14 ======= |
foozy@708 | 15 I am Alhaji Abba Abacha, son of the former |
foozy@708 | 16 |
foozy@708 | 17 Nigerian dictator Sani Abacha. |