Mercurial > hg

annotate tests/test-merge-types.out @ 5556:61fdf2558c0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: some tidyups, doc improvements, and test fixes The various back end options are now documented. The hg source can now be configured not to hand out a revision ID.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 27 Nov 2007 09:44:09 -0800
parents 305b035c5fda
children 026eb80060d8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5509
305b035c5fda Mark failing test as a known bug
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 ### This test is for a known, unfixed bug ###