Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge4.out @ 1612:0d36e3d7e2ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted test output to match new hgignore error messages.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 07 Jan 2006 16:34:20 +0100
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source