Junio C Hamano wrote: > I would rather see that done as a customized content-level merge backend, > i.e. at the same level as binary and union merges are specified. Losing > line number information just for the sake of the generic merge that does > not have domain knowledge (read: "stupid") is a way suboptimal solution to > the problem, I would think. Oh! You are definitely right. Thank you. -- 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