Mercurial > hg
annotate tests/test-simplemerge-cmd.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 | ea7b982b6c08 |
| children | e1f4343db740 |