summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2019-12-29 13:53:06 +0100
committerMichael Albinus <michael.albinus@gmx.de>2019-12-30 18:55:39 +0100
commit248c5e103d61af4352e2c8d9b810babdd4cd6ddf (patch)
tree46d9a74882b02f3069888eff457535db4cd64696 /admin/gitmerge.el
parent90083b7d78df1b8a054f3028cc9eb8c55a632b1e (diff)
downloademacs-248c5e103d61af4352e2c8d9b810babdd4cd6ddf.tar.gz
emacs-248c5e103d61af4352e2c8d9b810babdd4cd6ddf.tar.bz2
emacs-248c5e103d61af4352e2c8d9b810babdd4cd6ddf.zip
Sync with Tramp 2.4.3
* doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.4.3". * lisp/net/tramp.el: Bump version. (tramp-handle-shell-command): The temp file for error-buffer is remote. * test/lisp/net/tramp-tests.el (tramp-test30-make-process): Simplify buffer generation. (tramp-test32-shell-command): Extend test. (cherry picked from commit d6922db49dea33ac2bca8b33d24763cc7b2e4cd7)
Diffstat (limited to 'admin/gitmerge.el')
0 files changed, 0 insertions, 0 deletions