Re: bug#8047: 23.2.94; Auto image mode breaks C-x C-w

[Eli Zaretskii]

> From: Glenn Morris <address@hidden>
> Cc: Stefan Monnier <address@hidden>,  address@hidden,  address@hidden
> Date: Fri, 18 Feb 2011 22:38:30 -0500
> 
> If you fix the same thing two different ways at the same time in trunk
> and branch, please try to mark the branch commit with "do not merge to
> trunk".

Yes, I know I should.  I even told myself not to forget before typing
the commands, and I still forgot.  Sorry.

I wonder if we can invent some way of doing this without relying on
people's memory so much.  Or at least have a way of doing something
_after_ the commit to help the merge, if I do forget.