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

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.rename.bob.out@91a936be78b8
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{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'}