Package: wnpp Severity: wishlist * Package name : diffuse Version : 0.2.11 Upstream Author : Derrick Moser <[EMAIL PROTECTED]> * URL : http://diffuse.sourceforge.net/ * License : GPL Programming Lang: python (>= 2.4), python-gtk2 (>= 2.10) Description : Diffuse is a graphical tool for merging and comparing text files.
I am searching since years for a useful comparing and merging programm under Linux which is worth to compare with the famous WinMerge (GPL) program. (Sometime I even used winmerge with wine under Linux.) The authors writes following on his page: Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line-matching and directly edit files. Diffuse can also retrieve revisions of files from CVS, subversion, git, and mercurial repositories for comparison and merging. Key Features * 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 * syntax highlighting * CVS, git, mercurial, and subversion support * support for UTF-8 encoded unicode * unlimited undo * easy keyboard navigation Especially the last one is not to underestimate and makes the program very efficient and professional. Thanks! -- Ist Ihr Browser Vista-kompatibel? Jetzt die neuesten Browser-Versionen downloaden: http://www.gmx.net/de/go/browser -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]