annotate ja/examples/rename.divergent.rename.bob.out @ 803:5276f40fca1c

Propagate e6c99cbd0abd Updates to chapters 5, 6, and 7
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 09 Jul 2009 13:32:44 +0900
parents b0db5adf11c1
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{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'}