Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 2197:5de8b44f0446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
define standard name for base url to use when printing hgweb urls. useful for bugzilla integration, email notifications, other stuffs.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 04 May 2006 11:32:00 -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