cmdutil: sort unresolved paths

I noticed that `hg status` was printing unresolved paths in a
non-deterministic order. This patch fixes that.

I'm not sure if the sorting should be done in
merge.mergestate.unresolved() instead. Either way fixes the
presentation issue.

Differential Revision: https://phab.mercurial-scm.org/D4929

mercurial/cmdutil.py

@@ -581,7 +581,7 b' def _conflictsmsg(repo):'
     if unresolvedlist:
         mergeliststr = '\n'.join(
             ['    %s' % util.pathto(repo.root, encoding.getcwd(), path)
-             for path in unresolvedlist])
+             for path in sorted(unresolvedlist)])
         msg = _('''Unresolved merge conflicts:
 
 %s