master updated (e729ff5 -> 47f66e1)

[Glenn Morris]

gm pushed a change to branch master.

      from  e729ff5   * admin/gitmerge.el (gitmerge-skip-regexp): Be more 
restrictive.
      adds  2065316   Make comint-tests more robust (bug#38813)
      adds  957cdca   Make minibuffer-tests work in out-of-tree builds 
(bug#38816)
      adds  9b6872b   ; * test/lisp/calc/calc-tests.el: Fix warnings
       new  331f3f9   Merge from origin/emacs-27
      adds  5352947   Another adjustment to flex completion style's sorting 
function
      adds  fe0ed17   Slightly simplify lisp/icomplete.el with new 
icomplete--category helper
      adds  e3276f3   Make fido-mode behave more like ido-mode when finding 
directories
      adds  b1c3ed9   Move flex style's minibuffer-default-aware sorting to 
lisp/icomplete.el
      adds  9b1053b   Correctly cache sorted completions in 
icomplete--sorted-completions
      adds  f2a349b   Don't force completion recalculation in icomplete-fido-ret
      adds  195bde9   Don't always resort in recently introduced 
icomplete--sorted-completions
       new  47f66e1   ; Merge from origin/emacs-27


Summary of changes:
 test/lisp/calc/calc-tests.el  |  1 +
 test/lisp/comint-tests.el     | 12 ++++++------
 test/lisp/minibuffer-tests.el |  3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)