Letting tools partially resolve conflicts in a file

Hi,

I've searched the list and not found anything about this topic, but I figured I'd ask to be sure. The question is not specific to Git, but this seems like a forum where it might have been brought up.

You could imagine having a merge tool that was specialized for some purpose and only able to resolve a particular kind of conflict. An example would be a tool that resolves conflicts in `#include` lines or `import` lines. It could be useful to have such tools run as part of a chain of merge tools, where the final merge tool is what users normally have configured (such as `meld`, or the internal "attempt merge, or leave conflict markers" tool).

Has this problem come up before?

Thanks