diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -581,7 +581,7 @@ 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