detecting and merging differences between text files and folders
BSEditor: Compare and Merge is the Windows file compare utility for detecting and merging differences Between text files and folders, compare source code, compare program output, etc.

Easy to Use: Compare and Merge shows you the differences between files side-by-side and makes it easy to resolve these differences. Source code, output files, HTML, XML, etc.

Source Code Review: Compare source code to older versions and identify what has changed. C++, Visual Basic, Perl, PHP, Delphi, etc.

Merge Code: Merge your changes and those of your co-workers into one master copy. Select and click to merge a single line or an entire section of text. Unlimited undo/redo.

Folder Comparison: Analyze file differences for entire folder branches.

features:
-Compare Files visually side-by-side
-Compare Folders
-Compare over the network
-NEW Highlights differences within lines
-Summary bar gives quick feedback of all differences
-NEW Works like a text editor, you can fully edit text while comparing, with dynamic refreshing
-Merging is very easy with select and click or drag-and-drop
-NEW Multi-level undo/redo, also when merging folders
-Print comparison results Export comparison results to HTML
-Supports files with Unix and Mac line endings
-Integrates with version control systems
-Command-line support
-NEW Can be used directly from the Explorers context menu
-Many customization options, fonts, colors, comparison Algorithm
-Handy keyboard shortcuts
-Easy to install and uninstall , small program footprint


you can free download Compare and Merge 1.3 now.