Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 1892:622ee75cb4c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Directory names take precedence over symbolic names consistently. Previously this was only done for clone.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 12 Mar 2006 18:05:13 +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