annotate templates/tags.tmpl @ 275:61d45b0ba8fb

various merge improvements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 various merge improvements add -C flag: force update and overwrite local changes add -m flag: allow merges with conflicts we no longer do merge by default and we print a warning message when the merge fails fix bug in printing merge failure message fix bug diffing files in 'm' state manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj TiNsPIds560S5jgw44eWNto= =GPXN -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 07 Jun 2005 20:06:05 -0800
parents e93a16de0c66
children 11578820b5d7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
169
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
1 #header#
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
2 <title>#repo#: tags</title>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
3 </head>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
4 <body>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
5
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
6 <div class="buttons">
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
7 <a href="?cmd=changelog;rev=#rev#">changelog</a>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
8 <a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
9 </div>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
10
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
11 <h2>tags:</h2>
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
12
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
13 #entries#
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
14
e93a16de0c66 hgweb: actually commit the tags template
mpm@selenic.com
parents:
diff changeset
15 #footer#