Mercurial > hg
view templates/filelog.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 | 46c5e1ee8aaa |
children | 7f58dec6aeb7 |
line wrap: on
line source
#header# <title>#repo|escape#: #file|escape# history</title> <link rel="alternate" type="application/atom+xml" href="#url#atom-log/tip/#file|urlescape#" title="Atom feed for #repo|escape#:#file#"> <link rel="alternate" type="application/rss+xml" href="#url#rss-log/tip/#file|urlescape#" title="RSS feed for #repo|escape#:#file#"> </head> </head> <body> <div class="buttons"> <a href="#url#log{sessionvars%urlparameter}">changelog</a> <a href="#url#shortlog{sessionvars%urlparameter}">shortlog</a> <a href="#url#tags{sessionvars%urlparameter}">tags</a> <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a> <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a> <a type="application/rss+xml" href="#url#rss-log/tip/#file|urlescape#">rss</a> <a type="application/atom+xml" href="#url#atom-log/tip/#file|urlescape#" title="Atom feed for #repo|escape#:#file#">atom</a> </div> <h2>#file|escape# revision history</h2> <p>navigate: <small class="navigate">{nav%filenaventry}</small></p> #entries%filelogentry# #footer#