diffuse: diffuse - A graphical tool for merging and comparing text files
diffuse: 
diffuse: Diffuse is a small and simple text merge tool written in Python.
diffuse: With Diffuse you can easily merge, edit, review changes to your code.
diffuse: Diffuse is free software.
diffuse: 
diffuse: 
diffuse: 
diffuse: 
diffuse: 
diffuse: