Git-diff

Gitdiffindex(1) the linux kernel archives. Git ships with support to invoke vimdiff as a "mergetool" to help resolve merge conflic...