1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/rename.divergent.merge.out	Thu Oct 22 15:08:18 2009 +0800
     1.3 @@ -0,0 +1,26 @@
     1.4 +# See http://www.selenic.com/mercurial/bts/issue455
     1.5 +$ \textbf{cd ../orig}
     1.6 +$ \textbf{hg pull -u ../anne}
     1.7 +pulling from ../anne
     1.8 +searching for changes
     1.9 +adding changesets
    1.10 +adding manifests
    1.11 +adding file changes
    1.12 +added 1 changesets with 1 changes to 1 files
    1.13 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved
    1.14 +$ \textbf{hg pull ../bob}
    1.15 +pulling from ../bob
    1.16 +searching for changes
    1.17 +adding changesets
    1.18 +adding manifests
    1.19 +adding file changes
    1.20 +added 1 changesets with 1 changes to 1 files (+1 heads)
    1.21 +(run 'hg heads' to see heads, 'hg merge' to merge)
    1.22 +$ \textbf{hg merge}
    1.23 +warning: detected divergent renames of foo to:
    1.24 + bar
    1.25 + quux
    1.26 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    1.27 +(branch merge, don't forget to commit)
    1.28 +$ \textbf{ls}
    1.29 +bar  quux