upstream/mercurial-mirror Files · mercurial/templates/static

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.

Siddharth Agarwal -


            r27025:ec372573

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / static
background.png	Loading ...
coal-file.png	Loading ...
coal-folder.png	Loading ...
excanvas.js	Loading ...
feed-icon-14x14.png	Loading ...
hgicon.png	Loading ...
hglogo.png	Loading ...
mercurial.js	Loading ...
style-extra-coal.css	Loading ...
style-gitweb.css	Loading ...
style-monoblue.css	Loading ...
style-paper.css	Loading ...
style.css	Loading ...

	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