mercurial/merge.py

8744:6b675c781c6d

                    act("prompt delete", "r", f)
                else:
                    act("prompt keep", "a", f)
            elif n[20:] != "u":
                act("other deleted", "r", f)
        else:
            # file is created on branch or in working directory
            if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
                act("remote deleted", "r", f)

    for f, n in m2.iteritems():
        if partial and not partial(f):
            continue
        if f in m1:

8745:8fd6f6b8b37d

                    act("prompt delete", "r", f)
                else:
                    act("prompt keep", "a", f)
            elif n[20:] != "u":
                act("other deleted", "r", f)

    for f, n in m2.iteritems():
        if partial and not partial(f):
            continue
        if f in m1: