[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Merge conflicts

From: Glenn Morris
Subject: Merge conflicts
Date: Mon, 31 Aug 2020 13:18:18 -0400
User-agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)


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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]