Mercurial > hg

view tests/test-hgwebdirsym.out @ 6521:a3668330f14a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 63bdfcc3eaaf
children
line wrap: on
line source

adding a
adding b
adding c
% should succeed
200 Script output follows


/al/
/b/
/c/

200 Script output follows

a
200 Script output follows

b
200 Script output follows

c
% should fail
404 Not Found


error: repository circle not found
404 Not Found


error: repository circle not found
404 Not Found


error: repository circle not found
% collections errors