Mercurial > hg
view tests/test-debugrename.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 | 5a088ac232e6 |
children | f2618cacb485 |
line wrap: on
line source
adding a b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f % test with --rev b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3