Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1214:34706a835d4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Smarter handling of revlog key errors Use RevlogError for reporting exceptions Catch and report RevlogError exceptions at the command parser
author mpm@selenic.com
date Wed, 07 Sep 2005 23:38:28 -0700
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