Am 6/11/2010 9:34, schrieb Eyvind Bernhardsen: > On 11. juni 2010 07:49, Johannes Sixt wrote: >> I think you are going overboard here. Normalization should only happen >> only for data that moves from the worktree to the database. But during a >> merge, at most one part can come from the worktree, methinks; you are >> normalizing all three of them, though. > > Well, that's sort of the point. All three are normalized to (hopefully) > minimize the differences between them, increasing the chance of a > successful merge. I know what your point is. It is still inappropriate to call normalize_file() on data that comes from the repository. It is not the task of a merge procedure to blindly normalize data. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html