Re: master 01db800: Merge from origin/emacs-26

[Glenn Morris]

Michael Albinus wrote:

> branch: master
> commit 01db80046f41c94569efd5dcdb11a1e46b3f16f3
> Merge: 3ef212c 7eea314
> Author: Michael Albinus <address@hidden>
> Commit: Michael Albinus <address@hidden>
>
>     Merge from origin/emacs-26
>     
>     7eea3144d4 Minor Tramp fixes
>     c0a670a8b5 * lisp/help-mode.el (help-function-def): Allow help-make-x...
>     05720162c1 Fix doc-string of 'display-buffer-in-side-window'
>     a1bbc49015 Fix Bug#29579
>     cb3d979b74 ; NEWS: Update Org version number

Thanks for merging.
The NEWS change from cb3d979b74 seems to have gotten lost.
Any idea why?
It should have been applied to etc/NEWS.26 in master.

I tried to make gitmerge.el handled this automatically in master
0b6f4f2c60, so if you used that version of gitmerge, it may be my fault.