comparison hgext/sparse.py @ 47914:8e46934c58d2

dirstate: drop the deprecated `merge` method

The method was deprecated in 5.9.

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

47913:3911c61f09c6

    # Prevent adding files that are outside the sparse checkout
    editfuncs = [
        b'set_tracked',
        b'set_untracked',
        b'copy',
        b'merge',
    ]
    hint = _(
        b'include file with `hg debugsparse --include <pattern>` or use '
        + b'`hg add -s <file>` to include file directory while adding'
    )

47914:8e46934c58d2

    # Prevent adding files that are outside the sparse checkout
    editfuncs = [
        b'set_tracked',
        b'set_untracked',
        b'copy',
    ]
    hint = _(
        b'include file with `hg debugsparse --include <pattern>` or use '
        + b'`hg add -s <file>` to include file directory while adding'
    )