; Merge from origin/emacs-26
commit0f7c3bae445dc161835d9f1fea1461996aa1f6c6
authorGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:24 +0000 (18 12:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:24 +0000 (18 12:14 -0700)
tree6d449f44290ca3506af22e8851118b39028c9c7c
parentef02c9fd1a6bdafebc2bba58a551ec11e29bd394
parent6d4cbe80844a56e0b469fd6304ab7f24daa3d3af
; Merge from origin/emacs-26

The following commits were skipped:

6d4cbe8 Finish the Bug#11728 work: hg & git
66a491f Fix Bug#11728: show files updated by git