##// END OF EJS Templates
merge with stable
Benoit Boissinot -
r11144:ca46910d merge default
parent child Browse files
Show More
@@ -724,7 +724,7 class workingctx(changectx):
724 724 def findflag(ctx):
725 725 mnode = ctx.changeset()[0]
726 726 node, flag = self._repo.manifest.find(mnode, orig)
727 ff = self._repo.dirstate.flagfunc(lambda x: flag or None)
727 ff = self._repo.dirstate.flagfunc(lambda x: flag or '')
728 728 try:
729 729 return ff(path)
730 730 except OSError:
General Comments 0
You need to be logged in to leave comments. Login now