Mercurial > hg

diff hgext/sparse.py @ 47914:8e46934c58d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: drop the deprecated `merge` method The method was deprecated in 5.9. Differential Revision: https://phab.mercurial-scm.org/D11349
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 24 Aug 2021 21:11:57 +0200
parents 3911c61f09c6
children a6efb9180764
line wrap: on
line diff
--- a/hgext/sparse.py	Tue Aug 24 21:11:42 2021 +0200
+++ b/hgext/sparse.py	Tue Aug 24 21:11:57 2021 +0200
@@ -258,7 +258,6 @@
         b'set_tracked',
         b'set_untracked',
         b'copy',
-        b'merge',
     ]
     hint = _(
         b'include file with `hg debugsparse --include <pattern>` or use '