Hi Andreas,
git is not doing a plain patch, it is doing a merge. It is not unusual for a merge to have changes that are already present on both sides.
... which just goes to show that it is very easy to make a fool of
yourself with git if you have no mental model of what it does.
That's not news to me, I've done it before :-)
Thanks for your help.
Regards
Thomas
