Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/filelogentry.tmpl @ 174:23057dc57d1b
hg merge: abort if there are outstanding changes in the working directory
We currently don't support merging from the tip into the working
directory, so merge with outstanding local changes is asking for
trouble.
| author | mpm@selenic.com |
|---|---|
| date | Thu, 26 May 2005 22:54:48 -0800 |
| parents | fad9ad1ec7c7 |
| children | f918a6fa2572 |
| rev | line source |
|---|---|
|
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
142
diff
changeset
|
1 <table class="parity#parity#" width="100%" cellspacing="0" cellpadding="0"> |
| 138 | 2 <tr> |
|
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
142
diff
changeset
|
3 <td align="right" width="15%"><b>#age# ago: </b></td> |
| 142 | 4 <td><b><a href="?cmd=changeset;node=#node#">#shortdesc#</a></b></td</tr> |
| 138 | 5 <tr> |
| 167 | 6 <td align="right">revision #filerev#: </td> |
| 7 <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode#</a> | |
| 138 | 8 <a href="?cmd=filediff;file=#file#;node=#node#">(diff)</a> |
| 9 <a href="?cmd=annotate;file=#file#;filenode=#filenode#">(annotate)</a> | |
| 10 </td></tr> | |
| 11 <tr> | |
|
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
142
diff
changeset
|
12 <td align="right">author: </td> |
| 138 | 13 <td>#author#</td></tr> |
| 14 <tr> | |
|
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
142
diff
changeset
|
15 <td align="right">date: </td> |
| 138 | 16 <td>#date#</td></tr> |
| 142 | 17 </table> |
| 138 | 18 |
| 19 |