Mercurial > hg

annotate tests/test-merge3.out @ 10081:a5f3f9b1c42a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-rollback: Ignore hook exit code Failing hooks returned 255 on Solaris
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 16 Dec 2009 12:10:21 +0100
parents 91c56c427171
children
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 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed