Submitter | phabricator |
---|---|
Date | Dec. 10, 2019, 3:45 p.m. |
Message ID | <a2e524e518491b31bfc2d9a88a086157@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/43671/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -783,13 +783,12 @@ if not mergestate.active(): return - m = scmutil.match(repo[None]) - unresolvedlist = [f for f in mergestate.unresolved() if m(f)] + unresolvedlist = sorted(mergestate.unresolved()) if unresolvedlist: mergeliststr = b'\n'.join( [ b' %s' % util.pathto(repo.root, encoding.getcwd(), path) - for path in sorted(unresolvedlist) + for path in unresolvedlist ] ) msg = (