##// END OF EJS Templates
branching: fix wrong merge conflict resolution from 13dfad0f9f7a...
branching: fix wrong merge conflict resolution from 13dfad0f9f7a 13dfad0f9f7a 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
Show More
Name Size Modified Last Commit Author
/ mercurial / templates / static
__init__.py Loading ...
background.png Loading ...
coal-file.png Loading ...
coal-folder.png Loading ...
feed-icon-14x14.png Loading ...
followlines.js 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 ...