On Sat, May 14, 2011 at 21:21, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > 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. :) We went over this for the main gettext series. Not commiting the line numbers is unworkable, because it means that users who check out git.git can't run msgmerge, because it completely fails without line numbers. Having a merge strategy to deal with them would be nice, but that can be done by using the existing gitattributes config + msgmerge(1) to do the work. -- 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