unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Glenn Morris <rgm@gnu.org>
To: emacs-devel@gnu.org
Cc: Michael Albinus <michael.albinus@gmx.de>
Subject: Re: master 01db800: Merge from origin/emacs-26
Date: Sat, 09 Dec 2017 15:58:32 -0500	[thread overview]
Message-ID: <5xpo7n4o07.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <20171209102341.B679C20404@vcs0.savannah.gnu.org> (Michael Albinus's message of "Sat, 9 Dec 2017 05:23:41 -0500 (EST)")

Michael Albinus wrote:

> branch: master
> commit 01db80046f41c94569efd5dcdb11a1e46b3f16f3
> Merge: 3ef212c 7eea314
> Author: Michael Albinus <michael.albinus@gmx.de>
> Commit: Michael Albinus <michael.albinus@gmx.de>
>
>     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.



       reply	other threads:[~2017-12-09 20:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20171209102340.2914.60218@vcs0.savannah.gnu.org>
     [not found] ` <20171209102341.B679C20404@vcs0.savannah.gnu.org>
2017-12-09 20:58   ` Glenn Morris [this message]
2017-12-10  9:23     ` master 01db800: Merge from origin/emacs-26 Michael Albinus
2017-12-11 18:21       ` Glenn Morris
2017-12-11 18:26         ` Glenn Morris
2017-12-11 18:27         ` Michael Albinus
2017-12-11 18:38         ` Eli Zaretskii
2017-12-11 19:14           ` Glenn Morris
2017-12-11 19:34             ` Eli Zaretskii
2017-12-11 22:02               ` Glenn Morris
2017-12-12 22:05                 ` Richard Stallman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5xpo7n4o07.fsf@fencepost.gnu.org \
    --to=rgm@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=michael.albinus@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).