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

resolve: fix incorrect merge...

resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.

Takumi IINO - - Load All Authors

File last commit:

r20255:b1d65cb8 default


                r27025:ec372573

default

Download file

             header.tmpl
        
                    7 lines
            
             | 389 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / header.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

      <html>

      <head>

      <link rel="icon" href="{staticurl|urlescape}hgicon.png" type="image/png">

      <meta name="robots" content="index, nofollow" />

      <link rel="stylesheet" href="{staticurl|urlescape}style.css" type="text/css" />

      <script type="text/javascript" src="{staticurl|urlescape}mercurial.js"></script>

	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

				<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
				<html>
				<head>
				<link rel="icon" href="{staticurl\|urlescape}hgicon.png" type="image/png">
				<meta name="robots" content="index, nofollow" />
				<link rel="stylesheet" href="{staticurl\|urlescape}style.css" type="text/css" />
				<script type="text/javascript" src="{staticurl\|urlescape}mercurial.js"></script>