Mercurial > hg
view tests/test-clone-failure.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 | aaeb7f5d1052 |
children | a218ba5f60df |
line wrap: on
line source
abort: repository a not found! 255 abort: error: Connection refused 255 abort: repository a not found! 255 abort: destination '../a' already exists 255 abort: repository a not found! 255 destination directory: q abort: destination 'q' already exists