Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 46794:e2f7b2695ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 18 Mar 2021 18:24:59 -0400
parents 62c2857a174b 83ffc49f7e48
children d4ba4d51f85f
comparison
equal deleted inserted replaced
46782:6b52cffd8d0a 46794:e2f7b2695ba1
867 for path in self.unresolvedpaths 867 for path in self.unresolvedpaths
868 ] 868 ]
869 ) 869 )
870 msg = ( 870 msg = (
871 _( 871 _(
872 '''Unresolved merge conflicts: 872 b'''Unresolved merge conflicts:
873 873
874 %s 874 %s
875 875
876 To mark files as resolved: hg resolve --mark FILE''' 876 To mark files as resolved: hg resolve --mark FILE'''
877 ) 877 )