Merge/diff tool that can show authors (supports blame or annotate) in files under version control

Question

When merging files it will be helpful (as for me) to show an author of each line. Is there any diff or merge tool supporting that?

Answer 1

No. And, I think, never will be - when we merge, we think about content, not authorship