After an edit conflict happens, and the conflicting revisions have been merged, the repository still complains about the need to run "hg resolve".
Issues
![[logo.png]](/+download/logo.png){kind=logo}