Show More
@@ -3776,7 +3776,7 b' def clearunfinished(repo):' | |||
|
3776 | 3776 | raise error.StateError(state.msg(), hint=state.hint()) |
|
3777 | 3777 | |
|
3778 | 3778 | for s in statemod._unfinishedstates: |
|
3779 |
if s._opname == b'merge' or s |
|
|
3779 | if s._opname == b'merge' or s._reportonly: | |
|
3780 | 3780 | continue |
|
3781 | 3781 | if s._clearable and s.isunfinished(repo): |
|
3782 | 3782 | util.unlink(repo.vfs.join(s._fname)) |
General Comments 0
You need to be logged in to leave comments.
Login now