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

branching: fix wrong merge conflict resolution from 13dfad0f9f7a...

branching: fix wrong merge conflict resolution from merged stable into default, but accidentally added the _blockingreader class from stable (but deindented) instead of merging the changes from stable (2fe4efaa59af) into the existing _blockingreader class. This resulted in the _blockingreader being there two times.

Manuel Jacob -


            r50119:cdb85d05

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / rss
__init__.py	Loading ...
bookmarkentry.tmpl	Loading ...
bookmarks.tmpl	Loading ...
branchentry.tmpl	Loading ...
branches.tmpl	Loading ...
changelog.tmpl	Loading ...
changelogentry.tmpl	Loading ...
error.tmpl	Loading ...
filelog.tmpl	Loading ...
filelogentry.tmpl	Loading ...
header.tmpl	Loading ...
map	Loading ...
tagentry.tmpl	Loading ...
tags.tmpl	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