Re: merging emacs-24

[David Engster]

Eli Zaretskii writes:
>> From: David Engster <address@hidden>
>> Cc: Andreas Schwab <address@hidden>, address@hidden,
>> address@hidden, address@hidden
>
>> Date: Thu, 27 Nov 2014 19:46:02 +0100
>> 
>> Eli Zaretskii writes:
>> >> From: Andreas Schwab <address@hidden>
>> >> Cc: David Engster <address@hidden>, address@hidden,
>> >> address@hidden, address@hidden
>> >> Date: Thu, 27 Nov 2014 19:31:30 +0100
>> >> 
>> >> > Thanks, but why on master and not on emacs-24?
>> >> 
>> >> Why emacs-24?
>> >
>> > So that I have it no matter which branch is checked-out.
>> 
>> You'll have to checkout master if you want to merge into it
>
> We had bzrmerge on both branches.

Its initial commit was on trunk. 

>> If you feel strongly about it, I can backport it.
>
> If I'm the only one who needs that, I can solve my problem myself.

OK.

-David