equal
deleted
inserted
replaced
4480 pats = ['path:%s' % p for p in pats] |
4480 pats = ['path:%s' % p for p in pats] |
4481 m = scmutil.match(wctx, pats, opts) |
4481 m = scmutil.match(wctx, pats, opts) |
4482 for f in ms: |
4482 for f in ms: |
4483 if not m(f): |
4483 if not m(f): |
4484 continue |
4484 continue |
4485 flags = ''.join(['-%s ' % o[0] for o in flaglist |
4485 flags = ''.join(['-%s ' % o[0:1] for o in flaglist |
4486 if opts.get(o)]) |
4486 if opts.get(o)]) |
4487 hint = _("(try: hg resolve %s%s)\n") % ( |
4487 hint = _("(try: hg resolve %s%s)\n") % ( |
4488 flags, |
4488 flags, |
4489 ' '.join(pats)) |
4489 ' '.join(pats)) |
4490 break |
4490 break |