Junio C Hamano:
Even though I still think -Xours/-Xtheirs are nonsense options in the context of source code management, I suspect that they might be exactly what Peter needs in this situation.
Yes, it sounds like it would. That is not something I would use for source code management, but it would fit this, and some other use-cases I have, quite nicely.
I tend to use Git not only for source code management, but also for document synchronisation across machines which may, or may not, be connected to a network at any given time. Git is very nice for that sort of work.
; otherwise Peter's web site is seriously broken from the security point of view and no SCM can fix that),
Indeed. If it that was the case, I deserve whatever problems I get :-) -- \\// Peter - http://www.softwolves.pp.se/ -- 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