mercurial/simplemerge.py

44989:eb6380da47a5

    flags = localctx.flags()
    localflags = set(pycompat.iterbytestr(flags))
    otherflags = set(pycompat.iterbytestr(otherctx.flags()))
    if is_not_null(basectx) and localflags != otherflags:
        baseflags = set(pycompat.iterbytestr(basectx.flags()))
        flags = localflags & otherflags
        for f in localflags.symmetric_difference(otherflags):
            if f not in baseflags:
                flags.add(f)
        flags = b''.join(sorted(flags))

    if not opts.get(b'print'):
        localctx.write(mergedtext, flags)

    if m3.conflicts and not mode == b'union':

44990:4bb0ea78a70f

    flags = localctx.flags()
    localflags = set(pycompat.iterbytestr(flags))
    otherflags = set(pycompat.iterbytestr(otherctx.flags()))
    if is_not_null(basectx) and localflags != otherflags:
        baseflags = set(pycompat.iterbytestr(basectx.flags()))
        commonflags = localflags & otherflags
        addedflags = (localflags ^ otherflags) - baseflags
        flags = b''.join(sorted(commonflags | addedflags))

    if not opts.get(b'print'):
        localctx.write(mergedtext, flags)

    if m3.conflicts and not mode == b'union':