Mercurial > hg

annotate tests/test-merge3.out @ 11104:9fa028431957

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 07 May 2010 17:03:48 +0200
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