upstream/mercurial-mirror Files · mercurial/templates/spartan/footer.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.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r27025:ec372573

default

Download file

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

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

      {motd}

      <div class="logo">

      <a href="{logourl}">

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

      </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

				<script type="text/javascript">process_dates()</script>
				{motd}
				<div class="logo">
				<a href="{logourl}">
				<img src="{staticurl\|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>
				</div>

				</body>
				</html>