Re: merging revisions into emacs24 from trunk

[Kelvin White]

> Just somehow get the change you want to backport (e.g. "bzr diff .. | patch"
> or "bzr merge -r NN..MM" or even by hand) and commit it.  It's that simple.
> The only trick is that the commit message should include the key word
> "backport" somewhere so that bzrmerge.el will know to skip it to avoid
> spurious merge conflicts when we try to merge emacs-24 back into trunk.

I imagined it would be simple just wanted to make sure I didn't miss anything.
I tried the latter and had many conflicts, so I created a patch with bzr diff.
I will commit it shortly, thanks.