merge: invoke scmutil.fileprefetchhooks() prior to applying updates
This moves the file list calculation into core, so other extensions don't need
to duplicate it.
# See http://EditorConfig.org for the specificationroot = true[*.py]indent_size = 4indent_style = spacetrim_trailing_whitespace = true[*.{c,h}]indent_size = 8indent_style = tabtrim_trailing_whitespace = true