hgbook
diff en/examples/results/rename.divergent.merge.out @ 564:0d5935744f87
Switch from LaTeX to XML for examples.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 21:39:23 2009 -0700 (2009-03-09) |
parents | 44d1363234d2 |
children | 4432ad34b8e5 |
line diff
1.1 --- a/en/examples/results/rename.divergent.merge.out Mon Mar 09 21:37:47 2009 -0700 1.2 +++ b/en/examples/results/rename.divergent.merge.out Mon Mar 09 21:39:23 2009 -0700 1.3 @@ -1,6 +1,6 @@ 1.4 -# See http://www.selenic.com/mercurial/bts/issue455 1.5 -$ \textbf{cd ../orig} 1.6 -$ \textbf{hg pull -u ../anne} 1.7 +<screen># See http://www.selenic.com/mercurial/bts/issue455 1.8 +<prompt>$</prompt> <userinput>cd ../orig</userinput> 1.9 +<prompt>$</prompt> <userinput>hg pull -u ../anne</userinput> 1.10 pulling from ../anne 1.11 searching for changes 1.12 adding changesets 1.13 @@ -8,7 +8,7 @@ 1.14 adding file changes 1.15 added 1 changesets with 1 changes to 1 files 1.16 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1.17 -$ \textbf{hg pull ../bob} 1.18 +<prompt>$</prompt> <userinput>hg pull ../bob</userinput> 1.19 pulling from ../bob 1.20 searching for changes 1.21 adding changesets 1.22 @@ -16,11 +16,12 @@ 1.23 adding file changes 1.24 added 1 changesets with 1 changes to 1 files (+1 heads) 1.25 (run 'hg heads' to see heads, 'hg merge' to merge) 1.26 -$ \textbf{hg merge} 1.27 +<prompt>$</prompt> <userinput>hg merge</userinput> 1.28 warning: detected divergent renames of foo to: 1.29 bar 1.30 quux 1.31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.32 (branch merge, don't forget to commit) 1.33 -$ \textbf{ls} 1.34 +<prompt>$</prompt> <userinput>ls</userinput> 1.35 bar quux 1.36 +</screen>