Subject: bug#18840: 24.4; nt/README.W32: obsolete snippet

From: Eli Zaretskii <[email-masked]>
Date: Sun, 26 Oct 2014 20:24:38 +0200

> Date: Sun, 26 Oct 2014 19:05:32 +0100
> From: Dani Moncayo <[email-masked]>
> 
> > Committed & closing this bug.
> 
> I've just realized that this should have gone to emacs-24, not the
> trunk.  Sorry.
> 
> (I could back port this to emacs-24 is someone tell me how, or what
> doc to read).

You could simply apply the diffs, it's no big deal in this case.

If you want bzr to do the job for you, then the following will do it:

  cd emacs-24 && bzr merge -r 118218..118219 ../trunk

Then "bzr ci" as usual, but please be sure to say in the commit
message that this was "backported from trunk", so that the next merge
from emacs-24 to the trunk will skip this commit.

Thanks.