##// END OF EJS Templates
merge: check that there are no conflicts after --abort...
merge: check that there are no conflicts after --abort Same idea as in abcc82bf0717 (clean: check that there are no conflicts after, 2020-01-24). We should reuse more code here, but that will come later. Differential Revision: https://phab.mercurial-scm.org/D7994
Martin von Zweigbergk -
r44636:2b6632d6 default
Show More
Name Size Modified Last Commit Author
/ mercurial / thirdparty / zope / interface
common
LICENSE.txt Loading ...
__init__.py Loading ...
_compat.py Loading ...
_flatten.py Loading ...
_zope_interface_coptimizations.c Loading ...
adapter.py Loading ...
advice.py Loading ...
declarations.py Loading ...
document.py Loading ...
exceptions.py Loading ...
interface.py Loading ...
interfaces.py Loading ...
registry.py Loading ...
ro.py Loading ...
verify.py Loading ...