Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-hgrc.out @ 5390:36c46e20976a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 03 Oct 2007 23:09:36 +0200
parents 1e47f6fc0fdc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1474
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 abort: Failed to parse .../t/.hg/hgrc
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 File contains no section headers.
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 file: .../t/.hg/hgrc, line: 1
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 'invalid\n'