Mercurial > hgbook
annotate en/examples/rename.divergent.rename.bob.out @ 371:3f9f9b087109
more collab.tex
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Mon, 08 Dec 2008 12:30:31 +0900 |
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{cd ../bob} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 $ \textbf{hg mv foo quux} |
91a936be78b8
Document merge behaviour with file names.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 $ \textbf{hg ci -m 'Rename foo to quux'} |