Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1812:a81f99dfaa2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the synopsis of some commands, mark rawcommit as deprecated in short help
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 28 Feb 2006 22:50:49 +0100
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
1 adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 adding b