Mercurial > hgbook

annotate en/examples/rename.divergent.clone.out @ 414:635d7c0fcac3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 26 Aug 2008 14:06:41 -0700
parents b3501156a572
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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