Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 1834:24881eaebee3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes running 'hg serve' with Windows executable and no explicit template path configured. PY2EXE executables don't support __file__ but do place the directory of the shared code library into sys.prefix. Fixes bug 152.
author Lee Cantey <lcantey@gmail.com>
date Fri, 03 Mar 2006 13:41:12 -0800
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