Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 2354:16276b1c0658

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Manifest groups may be empty, so don't abort in this case (fixes issue210). Only abort on empty changelog and file revlogs.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 31 May 2006 22:25:20 +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