comparison mercurial/merge.py @ 3106:4ec28446fca8

merge: remove now unused umap dict

3105:7c7469d41ade

                  (short(p1), short(p2), short(pa)))

    action = []

    # update m1 from working dir
    umap = dict.fromkeys(unknown)

    for i,l in (("a", added), ("m", modified), ("u", unknown)):
        for f in l:
            m1[f] = m1.get(f, nullid) + i
            m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f)))

3106:4ec28446fca8

                  (short(p1), short(p2), short(pa)))

    action = []

    # update m1 from working dir
    for i,l in (("a", added), ("m", modified), ("u", unknown)):
        for f in l:
            m1[f] = m1.get(f, nullid) + i
            m1.set(f, util.is_exec(repo.wjoin(f), m1.execf(f)))