From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Merge conflicts
Date: Mon, 31 Aug 2020 13:18:18 -0400
Message-ID: <7timcyzqcl.fsf@fencepost.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="18838"; mail-complaints-to="usenet@ciao.gmane.io"
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
Cc: emacs-devel@gnu.org
To: michael.albinus@gmx.de
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 31 19:18:54 2020
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane-mx.org
Original-Received: from lists.gnu.org ([209.51.188.17])
	by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.92)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1kCnSI-0004op-7Z
	for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Aug 2020 19:18:54 +0200
Original-Received: from localhost ([::1]:46820 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1kCnSH-0001KP-A5
	for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Aug 2020 13:18:53 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51564)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <rgm@gnu.org>) id 1kCnRl-0000uK-Uj
 for emacs-devel@gnu.org; Mon, 31 Aug 2020 13:18:21 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:59966)
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <rgm@gnu.org>)
 id 1kCnRl-0006Cd-Dp; Mon, 31 Aug 2020 13:18:21 -0400
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82)
 (envelope-from <rgm@gnu.org>)
 id 1kCnRj-0008SR-1u; Mon, 31 Aug 2020 13:18:19 -0400
X-Spook: terrorism Phishing Al Jazeera Ansar al-Islam Nerve agent
X-Ran: w2<t`H?x|4PRR^2QtXxt5l(T]R&pHP`LB]97SA?zVp-$?:N"L?sf[B#5U52'*XkfiF7,%-
X-Hue: brightgreen
X-Attribution: GM
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Original-Sender: "Emacs-devel"
 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
Xref: news.gmane.io gmane.emacs.devel:254449
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/254449>


Hi,

Automatic merge of emacs-27 to master failed with numerous tramp conflicts.
Please could you resolve these? TIA.

       both modified:   doc/misc/tramp.texi
       both modified:   doc/misc/trampver.texi
       both modified:   lisp/net/tramp-adb.el
       both modified:   lisp/net/tramp-gvfs.el
       both modified:   lisp/net/tramp-rclone.el
       both modified:   lisp/net/tramp-sh.el
       both modified:   lisp/net/tramp-smb.el
       both modified:   lisp/net/tramp-sudoedit.el
       both modified:   lisp/net/tramp.el
       both modified:   lisp/net/trampver.el
       both modified:   test/lisp/net/tramp-tests.el