Mercurial > hg
view tests/test-hgrc.out @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | 1e47f6fc0fdc |
children | e51c0f41f271 |
line wrap: on
line source
abort: Failed to parse .../t/.hg/hgrc File contains no section headers. file: .../t/.hg/hgrc, line: 1 'invalid\n'