On Thu, Sep 25, 2008 at 09:05:02AM +0200, Thomas Rast <trast@xxxxxxxxxxxxxxx> wrote: > On the other hand, as near as I can tell this is a regression in > builtin-merge. Miklos, do you know if/how this can be fixed? I think Junio already fixed this in 446247d (merge: fix numerus bugs around "trivial merge" area, 2008-08-23), so 1.6.0.1 or 1.6.0.2 should not have this bug. Michael, could you please upgrade frm 1.6.0 and confirm your problem goes away? Thanks.
Attachment:
pgpEpAHBVg9zm.pgp
Description: PGP signature
