Mercurial > hg
view tests/test-audit-path @ 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 | d316124ebbea |
children | 11a4eb81fb4f |
line wrap: on
line source
#!/bin/sh hg init echo % should fail hg add .hg/00changelog.i mkdir a echo a > a/a hg ci -Ama ln -s a b echo b > a/b echo % should fail hg add b/b echo % should succeed hg add b echo % should still fail - maybe hg add b/b exit 0