Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/sparse.py
changeset 47914 8e46934c58d2
parent 47913 3911c61f09c6
child 48737 a6efb9180764 
--- 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 '
Mercurial