Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > Another thought I have had occasionally is that it would be nice if > the versions committed did not have line numbers while the working > copy had line numbers, so an ordinary 3-way merge could be more likely > to work for integrating changes[1]. But this second thought is less > fully cooked. :) 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. -- 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