Skip to content

evolvecmd: clear mergestate ourselves in _resolvephasedivergent()

Raphaël Gomès requested to merge topic/default/clear-ms into branch/default

repo.commitctx() does not clear the mergestate. We need to clear the mergestate ourselves here.

The issue poped up when we started having mergestate with extras and no conflicted files. Storage of these extras was recently added to mergestate.

Merge request reports