Two-way Text Comparison and Merge | | | |
Folder Comparison and Merge | | | |
Visual Studio Integration | | | |
Windows Explorer Integration | | | |
Command Line Interface and VCS Integration | | | |
Text Editor with Search and Bookmarks | | | |
Use Intellisense while Comparing Code | | | |
Syntax Highlighting for Multiple Languages | | | |
Show Changes within Compared Code Lines | | | |
Three-way Text Comparison and Merge | | | |
Automatic Files Merging | | | |
Structured Code Comparison | | | |
Changes Navigation Window | | | |
Moved Code Blocks Detection | | | |
Similar Code Lines Detection | | | |
Code Outlining (Folding) | | | |
Unchanged Regions Collapsing | | | |
Word-by-word Text Comparison | | | |
Line-by-line Text Comparison | | | |