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.
Showing
- mercurial/commands.py 1 addition, 1 deletionmercurial/commands.py
- tests/test-histedit-non-commute-abort.t 0 additions, 2 deletionstests/test-histedit-non-commute-abort.t
- tests/test-resolve.t 4 additions, 1 deletiontests/test-resolve.t
- tests/test-shelve.t 0 additions, 2 deletionstests/test-shelve.t
Loading
Please register or sign in to comment