changeset 26764 | 7ce6fd705495 |
parent 26759 | c0f475ac997e |
child 26770 | 3d1978cc949e |
--- a/mercurial/commands.py Sat Oct 17 12:32:23 2015 -0700 +++ b/mercurial/commands.py Thu Oct 15 00:45:20 2015 -0700 @@ -5588,7 +5588,8 @@ for f in ms: if not m(f): continue - l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved'}[ms[f]] + l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', + 'd': 'driverresolved'}[ms[f]] fm.startitem() fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l) fm.write('path', '%s\n', f, label=l)