*** /tmp/ediffZ2Vta6	2022-02-25 10:19:16.687168929 +0100
--- /home/albinus/src/tramp-2-5-stable/lisp/tramp-sh.el	2022-02-25 09:57:23.983499048 +0100
***************
*** 4760,4766 ****
  	      (with-temp-buffer
  		(tramp-call-process vec "ssh" nil t nil "-o" "ControlMaster")
  		(goto-char (point-min))
! 		(when (search-forward-regexp "missing.+argument" nil t)
  		  (setq tramp-ssh-controlmaster-options
  			"-o ControlMaster=auto")))
  	      (unless (zerop (length tramp-ssh-controlmaster-options))
--- 4760,4766 ----
  	      (with-temp-buffer
  		(tramp-call-process vec "ssh" nil t nil "-o" "ControlMaster")
  		(goto-char (point-min))
! 		(when (search-forward-regexp "\\(missing\\|no\\).+argument" nil t)
  		  (setq tramp-ssh-controlmaster-options
  			"-o ControlMaster=auto")))
  	      (unless (zerop (length tramp-ssh-controlmaster-options))