hgbook
diff en/examples/results/branch-repo.pull.out @ 593:8dfdbe1cf982
Update Apache2 configuration.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Mar 26 22:00:32 2009 -0700 (2009-03-26) |
parents | 44d1363234d2 |
children | 4432ad34b8e5 |
line diff
1.1 --- a/en/examples/results/branch-repo.pull.out Mon Mar 09 21:37:47 2009 -0700 1.2 +++ b/en/examples/results/branch-repo.pull.out Thu Mar 26 22:00:32 2009 -0700 1.3 @@ -1,9 +1,9 @@ 1.4 -$ \textbf{cd ..} 1.5 -$ \textbf{hg clone myproject myproject-merge} 1.6 +<screen><prompt>$</prompt> <userinput>cd ..</userinput> 1.7 +<prompt>$</prompt> <userinput>hg clone myproject myproject-merge</userinput> 1.8 updating working directory 1.9 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.10 -$ \textbf{cd myproject-merge} 1.11 -$ \textbf{hg pull ../myproject-1.0.1} 1.12 +<prompt>$</prompt> <userinput>cd myproject-merge</userinput> 1.13 +<prompt>$</prompt> <userinput>hg pull ../myproject-1.0.1</userinput> 1.14 pulling from ../myproject-1.0.1 1.15 searching for changes 1.16 adding changesets 1.17 @@ -11,3 +11,4 @@ 1.18 adding file changes 1.19 added 1 changesets with 1 changes to 1 files (+1 heads) 1.20 (run 'hg heads' to see heads, 'hg merge' to merge) 1.21 +</screen>