New features:

• Changed copyright statement.
• Additional small enhancements to the Windows Explorer context menu extension.

New features:

• Added "copy line" and "delete line" buttons to the toolbar.
• Added "Search for selected text" option. With this option enabled, Find, Find Next and Find Prev will search for the currently selected text, not the text that was last searched for.
• Added "Jump to next diff after merge command" option.
• New keyboard shortcuts: Ctrl+F7 and Ctrl+F8 to copy differences to the left and right sides, respectively.
• Small enhancements to the Windows Explorer context menu extension.

New features:

• Added the Quick Bar, which remembers the most recent comparisons. Handy if you have to compare the same files or folders often.
• The popup menu in Window Explorer now has a "Compare..." item. Select two files or folders and click "Compare..." to open them in Compare and Merge.
• New option: "Double-click in folder window to perform default action". Use this option to prevent unintentionally copying or deleting your files in the New and Old tabs.
• New option: "Smart refresh". The window will refresh automatically after you picked the second file, so you don't have to click Refresh anymore.

Bug fixes:

• You can now start typing your filenames immediately when a new window opens.
• Pressing Escape when a combo box drop-down is open will no longer quit the application.
• On certain keyboard layouts, you could not insert special chars with AltGr.
• Text files with ASCII characters over 127 were often improperly recognized as binary.
• Discovery of changes (orange arrows) is now a little smarter.

New features:

• You can now drag-and-drop text (easier merging).
• Quickly copy or delete single lines with the new 'Copy Line' and 'Delete Line' menu items.
• Added new keyboard shortcuts: Shift-Del (cut), Ctrl-Ins (copy), Shift-Ins (paste).
• Various speed improvements to make the screen redraw faster.

Bug fixes:

• The include/exclude fields from the Folder Options did not scroll properly, limiting the amount of text you could enter.

Bug fixes:

• On Windows XP (and possibly 2000 and NT4), the Options window would disappear a few seconds after you opened it, crashing Compare and Merge. This problem has now been fixed.

• Version 2.0 was rewritten from scratch to become faster, more flexible, and much more powerful.
• You can now type directly in the text panes. The diffs will update immediately as a result.
• The folder comparison feature has been completely re-designed.
• Can read and write files with Unix and Mac line endings.
• Simplified the keyboard shortcuts.
• Added many new options.
• Temporarily not supported: Print Preview, drag-and-drop. These features will be added back in a future version.

• Fixed a bug that made it impossible to compare files or folders whose names included special accented characters such as umlauts.
• You can now export the comparison results to an HTML file.
• You can now search through the files with the Find command.
• New options:
  • Change the background color for the "empty" parts of differences.
  • Set a different font size for printing (typically smaller than the on-screen font size), so you can fit as much text as possible on the paper.
  • Disable wrapping when cycling through differences using the Next Difference and Previous Difference commands.
  • Disable highlighting of differences in changed lines.
• Other small changes and additions:
  • The toolbar now has a button to show the Options box.
  • The Insert Blank Line command makes it easier to perform certain merges.
  • You can press Enter in a file name edit box to perform a new comparison.
  • The file/folder name drop down boxes try to show as much as possible of the history, so you don't have to scroll through them as much.
  • The popup menu has an "Open / Explore" command, which opens files in their default application and folders in Windows Explorer.
  • The new Compare Parents menu item lets you immediately compare the parent folders of the current file or folder.

• New options:
  • "Show message if files or folders are identical"
  • "Automatically scroll to first difference (on refresh)"
  • "Hide identical files and folders"
  • "Ask for confirmation before closing modified files"
  • View real, "virtual", or no line numbers
• Improved merging:
  • You can now drag-and-drop lines inside the same file.
  • To delete lines you now have to drag them outside of the window. This feature is only available if the "Delete lines when dropped outside window" option is enabled.
  • You can now double-click to copy lines to the other side.
• Compare and Merge is now much faster on large files.
• New Replace Left and Replace Right commands, which save you the trouble of copying over all of the differences yourself.
• You can now print the comparison results.
• You can now quit the application with the Esc key.
• Fixed the problem with comparing folders over the network.

• You can now use Compare and Merge from the command line. With this feature you can hook up Compare and Merge to your version control system, for example.
• Improved merging. You can now copy and delete individual lines, and drag-and-drop lines from one file to the other, to any position you want. This gives you precise control over the merging process.
• Added several new options: you can now set the colors of the arrows, Compare Files can ignore all whitespace (not just spaces and tabs), and Compare Folders can look into subfolders.
• Many other improvements, such as better keyboard control, easier navigation, the ability to copy lines to the clipboard, and much more.

• Fixed a bug that made it impossible to start Compare and Merge on certain non-English versions of Windows NT4, the German version in particular.

• You can now compare and merge entire folders. Compare and Merge shows you which files are missing, and which ones are different. Bring your directories up-to-sync easily.
• Compare and Merge now recognizes when a file is read-only, and prevents you from making changes to such files.
• The Check for Updates command from the Help menu will let you know whether a new version of Compare and Merge is available for download.

• First release.