Read about our upcoming Code of Conduct on this issue

Commit 4bc2558b authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

resolve: record dirstate actions after performing resolutions

Some resolutions might lead to pending actions we need to perform in the
dirstate -- so perform them.
parent e2b79f57903a
......@@ -5711,6 +5711,7 @@ def resolve(ui, repo, *pats, **opts):
raise
ms.commit()
ms.recordactions()
if not didwork and pats:
ui.warn(_("arguments do not match paths that need resolving\n"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment