Mercurial > hg
view templates/footer.tmpl @ 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 | 9b817c0a82f1 |
children |
line wrap: on
line source
#motd# <div class="logo"> <a href="http://www.selenic.com/mercurial/"> <img src="#staticurl#hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> </div> </body> </html>