Improving merge of tricky conflicts

Hi,

I have been looking for a tool to display merge conflicts, that instead of showing the two versions of the conflicting section, would show the diff for that section in both conflicting commits.

The situation that would benefit a lot from this is when one branch has modified a large section of code (e.g. change in indentation), while the other branch has only a small change. In that case git will display the entire modified section twice, making it very hard to spot the difference.

Being able to see both commits diff would immediately make it clear how to apply the small change into the branch with the large edit.

I've looked around but couldn't find anything, but I'm pretty sure solutions exists. Anyone knows of an existing tool / script that does this?

Thank you, B. Stebler