Mercurial > hg
view tests/test-serve.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 | de7256c82fad |
children | 7c36aee46bf5 |
line wrap: on
line source
% Without -v access log created - .hg/hgrc respected % With -v listening at http://localhost/ (127.0.0.1) % With --prefix foo listening at http://localhost/foo/ (127.0.0.1) % With --prefix /foo listening at http://localhost/foo/ (127.0.0.1) % With --prefix foo/ listening at http://localhost/foo/ (127.0.0.1) % With --prefix /foo/ listening at http://localhost/foo/ (127.0.0.1)