Submitter | phabricator |
---|---|
Date | Aug. 29, 2017, 2:05 p.m. |
Message ID | <bca982bb91ffd66c66f435f35beb2cce@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/23468/ |
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 @@ -587,7 +587,7 @@ return m = scmutil.match(repo[None]) - unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u'] + unresolvedlist = [f for f in mergestate.unresolved() if m(f)] if unresolvedlist: mergeliststr = '\n'.join( [' %s' % os.path.relpath(