Mercurial > hg
view templates/changeset.tmpl @ 4682:dc5920ea12f8
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 22 Jun 2007 20:44:40 -0300 |
parents | ce8f31e0b3b8 |
children | 673d8a6bc709 |
line wrap: on
line source
#header# <title>#repo|escape#: changeset #node|short#</title> </head> <body> <div class="buttons"> <a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a> <a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a> <a href="#url#tags{sessionvars%urlparameter}">tags</a> <a href="#url#file/#node|short#{sessionvars%urlparameter}">manifest</a> <a href="#url#raw-rev/#node|short#">raw</a> #archives%archiveentry# </div> <h2>changeset: #desc|strip|escape|firstline#</h2> <table id="changesetEntry"> <tr> <th class="changeset">changeset #rev#:</th> <td class="changeset"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td> </tr> #parent%changesetparent# #child%changesetchild# #changesettag# <tr> <th class="author">author:</th> <td class="author">#author|obfuscate#</td> </tr> <tr> <th class="date">date:</th> <td class="date">#date|date# (#date|age# ago)</td></tr> <tr> <th class="files">files:</th> <td class="files">#files#</td></tr> <tr> <th class="description">description:</th> <td class="description">#desc|strip|escape|addbreaks#</td> </tr> </table> <div id="changesetDiff"> #diff# </div> #footer#