##// 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 / revlogutils
__init__.py Loading ...
concurrency_checker.py Loading ...
constants.py Loading ...
deltas.py Loading ...
docket.py Loading ...
flagutil.py Loading ...
nodemap.py Loading ...
randomaccessfile.py Loading ...
revlogv0.py Loading ...
rewrite.py Loading ...
sidedata.py Loading ...