1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/tour-merge-conflict.merge.out	Thu Sep 10 01:08:16 2009 +0200
     1.3 @@ -0,0 +1,17 @@
     1.4 +$ \textbf{export HGMERGE=merge}
     1.5 +$ \textbf{hg merge}
     1.6 +merging letter.txt
     1.7 +merge: warning: conflicts during merge
     1.8 +merging letter.txt failed!
     1.9 +0 files updated, 0 files merged, 0 files removed, 1 files unresolved
    1.10 +There are unresolved merges, you can redo the full merge using:
    1.11 +  hg update -C 1
    1.12 +  hg merge 2
    1.13 +$ \textbf{cat letter.txt}
    1.14 +Greetings!
    1.15 +
    1.16 +I am Shehu Musa Abacha, cousin to the former
    1.17 +=======
    1.18 +I am Alhaji Abba Abacha, son of the former
    1.19 +
    1.20 +Nigerian dictator Sani Abacha.