Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.
It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
ability to compare and merge an arbitrary number of files side-by-side (n-way merges)
line matching can be manually corrected by the user
ability to directly edit files
Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
support for UTF-8 encoded unicode
easy keyboard navigation