annotate en/examples/rename.divergent.rename.bob.out @ 515:15bf7d50b586

Translated a couple of paragraphs
author jerojasro@devnull.li
date Wed, 12 Nov 2008 22:36:35 -0500
parents 91a936be78b8
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'}