marking commits not to be merged after the fact [was Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w]

[Glenn Morris]

Eli Zaretskii wrote:

> Or at least have a way of doing something _after_ the commit to help
> the merge, if I do forget.

You can add an entry to bzrmerge-skip-regexp that only matches your
commit and no other. :)
I can't think of anything else you can do... except immediately do the
merge yourself (not necessary in this case!) :)