Skip to content
Snippets Groups Projects
Commit 6062593d8b06 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

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.
parent 0c4077905932
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment