contrib/dirstatenonnormalcheck.py
changeset 47914 8e46934c58d2
parent 47913 3911c61f09c6
child 47915 51cd60c0a345
--- a/contrib/dirstatenonnormalcheck.py	Tue Aug 24 21:11:42 2021 +0200
+++ b/contrib/dirstatenonnormalcheck.py	Tue Aug 24 21:11:57 2021 +0200
@@ -60,7 +60,6 @@
             # We don't do all these checks when paranoid is disable as it would
             # make the extension run very slowly on large repos
             extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
-            extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate)
             extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate)