63     "check for collisions between unknown files and files in mctx"

    63     "check for collisions between unknown files and files in mctx"

    64     man = mctx.manifest()

    64     man = mctx.manifest()

    65     for f in wctx.unknown():

    65     for f in wctx.unknown():

    66         if f in man:

    66         if f in man:

    67             if mctx.filectx(f).cmp(wctx.filectx(f).data()):

    67             if mctx.filectx(f).cmp(wctx.filectx(f).data()):

    69                                    " from remote version") % f)

    69                                    " from remote version") % f)

    70 

    70 

    71 def checkcollision(mctx):

    71 def checkcollision(mctx):

    72     "check for case folding collisions in the destination context"

    72     "check for case folding collisions in the destination context"

    73     folded = {}

    73     folded = {}