upstream/mercurial-mirror Files · mercurial/templates/spartan/footer.tmpl

resolve: restore .orig only after merge is fully complete (issue4952)...

resolve: restore .orig only after merge is fully complete (issue4952) Previously, we'd restore the .orig file after the premerge is complete but before the merge was complete. This would lead to the .orig file potentially containing merge conflict markers in it, as a leftover from the last merge attempt.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r26959:ed5f20f9

stable

Download file

             footer.tmpl
        
                    9 lines
            
             | 218 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / footer.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Benoit Allard
    
web: Made elapsed time calculation dynamic (javascript)....

              r14046
            
      <script type="text/javascript">process_dates()</script>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {motd}

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      </body>

      </html>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Benoit Allard web: Made elapsed time calculation dynamic (javascript)....	r14046	<script type="text/javascript">process_dates()</script>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{motd}
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		</body>
		</html>