Mercurial > hgbook

annotate en/examples/results/rename.divergent.clone.out @ 662:44d1363234d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move example output files into examples/results
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:37:47 -0700
parents en/examples/rename.divergent.clone.out@b3501156a572
children 0d5935744f87
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