[Emacs-diffs] emacs-26 updated (1d599df -> 48d39c3)

[Tom Tromey]

tromey pushed a change to branch emacs-26.

      from  1d599df   Fix last change to textmodes/page-ext.el
       new  13aba24   Call vc-setup-buffer in vc-git-log-{in,out}going
       new  9d10137   Allow smerge-keep-current to work for empty hunks
       new  48d39c3   Search for Syntax section when viewing MDN


Summary of changes:
 lisp/textmodes/css-mode.el                         |  2 +-
 lisp/vc/smerge-mode.el                             |  2 +-
 lisp/vc/vc-git.el                                  |  2 ++
 .../{shell-tests.el => vc/smerge-mode-tests.el}    | 27 +++++++++++-----------
 4 files changed, 18 insertions(+), 15 deletions(-)
 copy test/lisp/{shell-tests.el => vc/smerge-mode-tests.el} (54%)