comparison mercurial/merge.py @ 48708:25d5dffbb211

merge: stop using merge action for pathconflict option

This is not the b'r' you are looking for.

Differential Revision: https://phab.mercurial-scm.org/D12111

48707:48aff31e7f4c

                        b'remote path conflict',
                    )
                mresult.addfile(
                    p,
                    mergestatemod.ACTION_PATH_CONFLICT,
                    (pnew, mergestatemod.ACTION_REMOVE),
                    b'path conflict',
                )
                remoteconflicts.remove(p)
                break

48708:25d5dffbb211

                        b'remote path conflict',
                    )
                mresult.addfile(
                    p,
                    mergestatemod.ACTION_PATH_CONFLICT,
                    (pnew, b'r'),
                    b'path conflict',
                )
                remoteconflicts.remove(p)
                break