[PATCH 1 of 2 merge v4 icasefix] merge: use separate lists for each action type

[Augie Fackler]

On May 26, 2014, at 12:56 PM, Mads Kiilerich <mads at kiilerich.com> wrote:

> On 05/26/2014 06:27 PM, Augie Fackler wrote:
>> On Tue, May 20, 2014 at 12:21:20AM +0200, Mads Kiilerich wrote:
>>> # HG changeset patch
>>> # User Mads Kiilerich <madski at unity3d.com>
>>> # Date 1393550758 -3600
>>> #      Fri Feb 28 02:25:58 2014 +0100
>>> # Node ID 111ac591e635a591be66d780a777b65cfbef76b3
>>> # Parent  d19164a018a175cda640066a1f32651834e4f011
>>> merge: use separate lists for each action type
>>> 
>> I see this as already applied as 43eecb4e23f8, so I'm not re-queueing it.
> 
> I do not see that anywhere. That might have been previous revision that was dropped again.

Because I'm an idiot. This one applied, but the child failed for me with bizarre conflicts. Can you resend patch 2 and cc me, and I'll fast-track it?

Sorry for the trouble.

> 
> /Mads
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20140526/f00f3a0d/attachment.pgp>