Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-oldcgi.out @ 2548:0229ff95faec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents 8106e477f584
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2533
589474a1dc36 Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
1 0
589474a1dc36 Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
2 0
2536
8106e477f584 Fix new tests to be better. In particular, fix webraw test to
Eric Hopper <hopper@omnifarious.org>
parents: 2533
diff changeset
3 0