Mercurial > hgbook
annotate en/examples/rename.divergent.clone.out @ 402:b3501156a572
Fix sample output for 'rename.divergent' test.
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 22:01:27 +0200 |
parents | 91a936be78b8 |
children |
rev | line source |
---|---|
156
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 $ \textbf{hg clone orig anne} |
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 |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 $ \textbf{hg clone orig bob} |
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 |