Mercurial > hgbook
annotate en/examples/results/rename.divergent.clone.out @ 663:0d5935744f87
Switch from LaTeX to XML for examples.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 09 Mar 2009 21:39:23 -0700 |
parents | 44d1363234d2 |
children | 4432ad34b8e5 |
rev | line source |
---|---|
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
1 <screen><prompt>$</prompt> <userinput>hg clone orig anne</userinput> |
402
b3501156a572
Fix sample output for 'rename.divergent' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents:
156
diff
changeset
|
2 updating working directory |
156
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
4 <prompt>$</prompt> <userinput>hg clone orig bob</userinput> |
402
b3501156a572
Fix sample output for 'rename.divergent' test.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents:
156
diff
changeset
|
5 updating working directory |
156
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
663
0d5935744f87
Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents:
662
diff
changeset
|
7 </screen> |