最終更新:2012-04-05 (木) 13:47:47 (4403d)
Diffuse
Top / Diffuse
http://diffuse.sourceforge.net/
graphical tool for merging and comparing text files
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
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone,? RCS, Subversion, and SVK support
- support for UTF-8 encoded unicode
- unlimited undo
- easy keyboard navigation
