##// END OF EJS Templates
resolve: don't abort resolve -l even when no merge is in progress...
resolve: don't abort resolve -l even when no merge is in progress This broke some internal automation that was quite reasonably checking for unresolved files as a way to determine whether a merge happened cleanly. We still abort for resolve --mark etc.
Siddharth Agarwal -
r21541:6062593d default
Show More
Name Size Modified Last Commit Author
/ mercurial / pure
__init__.py Loading ...
base85.py Loading ...
bdiff.py Loading ...
diffhelpers.py Loading ...
mpatch.py Loading ...
osutil.py Loading ...
parsers.py Loading ...