Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 2755:6c2c10cedf7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check for parent/mod as well as parent.mod in findext. Debian/Ubuntu ship a system-wide hgrc that loads extensions using the syntax hgext/extension=, rather than hgext.extension=. Although the extensions work correctly, hg help <extension> doesn't understand this form without this patch.
author Brendan Cully <brendan@kublai.com>
date Tue, 01 Aug 2006 14:56:54 -0700
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