Mercurial > hg
view templates/filediff.tmpl @ 1701:4ba8fe499df2
hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:10 -0600 |
parents | f2ebd5251e88 |
children | 46b19175fec6 |
line wrap: on
line source
#header# <title>#repo|escape#: #file|escape# diff</title> </head> <body> <div class="buttons"> <a href="?cl=#rev#">changelog</a> <a href="?tags=">tags</a> <a href="?cs=#node|short#">changeset</a> <a href="?f=#filenode|short#;file=#file|urlescape#">file</a> <a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a> <a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a> <a href="?fd=#node|short#;file=#file|urlescape#;style=raw">raw</a> </div> <h2>#file|escape#</h2> <table id="filediffEntry"> <tr> <th class="revision">revision #rev#:</th> <td class="revision"><a href="?cs=#node|short#">#node|short#</a></td> </tr> #parent%filediffparent# #child%filediffchild# </table> <div id="fileDiff"> #diff# </div> #footer#