Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/footer.tmpl @ 1798:d610fe0e6893
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Thu, 23 Feb 2006 18:10:04 +0100 |
parents | 90b62337f8dd |
children | c72e618c1204 |
rev | line source |
---|---|
1417
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
1 <div class="logo"> |
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
2 powered by<br/> |
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
3 <a href="http://www.selenic.com/mercurial/">mercurial</a> |
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
4 </div> |
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
5 |
142 | 6 </body> |
7 </html> |