Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/footer.tmpl @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | c72e618c1204 |
children |
rev | line source |
---|---|
2148
c72e618c1204
Add MOTD display to hgweb and hgwebdir.
Colin McMillen <mcmillen@cs.cmu.edu>
parents:
1417
diff
changeset
|
1 #motd# |
1417
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
2 <div class="logo"> |
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
3 powered by<br/> |
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
4 <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
|
5 </div> |
90b62337f8dd
hgweb: add a mercurial link to the footer
Matt Mackall <mpm@selenic.com>
parents:
142
diff
changeset
|
6 |
142 | 7 </body> |
8 </html> |