Praqma
Does this work with git mergetool?
Does this "merge driver" work with git mergetool? It seems the parameters git mergetool passes are different than %O %A %B.
I haven't played much with mergetool, but from my experience they serve different purposes, so it might not make much sense to try and combine them.
I'd configure/use mergetool to provide a nicer user experience when resolving conflicts in plain text files. Whereas I'd only use a merge driver when an external application is required to even make sense of the merge (conflict).
For example (and the case that had me investigating merge drivers all those years ago): I was helping a development team that did development in a third party GUI tool, their "code" were large XML files this tool would output. Every change they made completely scrambled those XML files, so merging changes by hand was near impossible. We used a merge driver to take the conflicting files and throw them back at the tool, which luckily shipped with the functionality to help merge those changes.
Hope that helps.
