Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling w32heap.c with -funroll-loops.

[Glenn Morris]

Eli Zaretskii wrote:

> When I committed it to the branch, I debated how to indicate that it
> doesn't need to be applied to trunk, but there doesn't seem to be
> anything to support that in bzrmerge.el.  Did I miss something?

Just write "No need to merge to trunk" in the commit log.

Anything that matches bzrmerge-skip-regexp, to make the merger take note.