Hi again, Ãvar ArnfjÃrà Bjarmason wrote: > 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. Please feel free to ignore my other reply. You were saying something helpful there, not just calling me out, and I completely misunderstood. I assume you were referring to this discussion: http://thread.gmane.org/gmane.comp.version-control.git/147973/focus=148044 I'm confused about the msgmerge comment above. I'll have to try it. But anyway, of course I agree with the more important point that not providing line numbers would make life harder for humans. > 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. I'm still curious about this part, of course. Thanks, Jonathan -- 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