Mercurial > hg > pyhgsh

annotate tests/test-merge2.out @ 1527:c13fce7167c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't print anything about file of unsupported type unless the file was specified on the command line
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 11 Nov 2005 15:33:08 -0800
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