Be good to have different git merge strategies per file type. e.g. A merge that knows properties files support the same property added in different places but

Be good to have different git merge strategies per file type. e.g. A merge that knows properties files support the same property added in different places but only once is needed. And another strategy if order is significant. Cool to have an HTML merge that recognises the tree structure and supports merging tags and having the indentation follow some rules. I believe git supports merge strategies, its been on my todo list forever.