This should be fixed now. I think this was a recent regression which only kicked in when resolving conflicts. If you still see this in other situations, let me know.
Jonas -- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
