Vimdiff also support 3-way diffs. Git integration with fugitive is also worth mentioning. It makes partial committing and cherry picking very easy. Either way

Vimdiff also support 3-way diffs. Git integration with fugitive is also worth mentioning. It makes partial committing and cherry picking very easy. Either way, icdiff looks very promising.