##// 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
attr
cbor
concurrent
sha1dc
xdiff
zope
__init__.py Loading ...
selectors2.py Loading ...