diff -r 55e8efa2451a -r 46a54de96a54 mercurial/merge.py --- a/mercurial/merge.py Tue Feb 06 22:36:38 2018 +0900 +++ b/mercurial/merge.py Tue Feb 06 22:55:02 2018 +0900 @@ -25,7 +25,6 @@ from . import ( copies, error, - extensions, filemerge, match as matchmod, obsutil, @@ -1992,6 +1991,8 @@ fsmonitorthreshold = repo.ui.configint('fsmonitor', 'warn_update_file_count') try: + # avoid cycle: extensions -> cmdutil -> merge + from . import extensions extensions.find('fsmonitor') fsmonitorenabled = repo.ui.config('fsmonitor', 'mode') != 'off' # We intentionally don't look at whether fsmonitor has disabled