Mercurial > hg
view tests/test-nested-repo.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 | c7e8fe11f34a |
children |
line wrap: on
line source
# should print nothing # should fail abort: path 'b/x' is inside repo 'b' abort: path 'b/x' is inside repo 'b' # should fail abort: path 'b/x' is inside repo 'b' # should arguably print nothing # should fail abort: path 'b/a' is inside repo 'b'