Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 3755:05120e210c65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use unsigned version format. This way can use one additional bit, and when encountering invalid revlogs with the first bit set don't produce python warnings or strange error messages.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 23:27:53 +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