9. Comparing Files

File compare window is basically two files opened to editor into two horizontal panes. Editing files is the big difference between 1.7.1 and newer versions. Editing allows user to easily do small changes without the need to open the files to other editor or development environment.

WinMerge editor is not comparable to specialized editor programs, but it has basic features like Undo/Redo, Find/Replace and Goto (to linenumber). The editor also has a syntax highlighting feature supporting several file formats (colors configurable). Note however WinMerge does not syntax highlight text inside differences. Syntax highlighting can be disabled from options.

Tip

If Automatic rescan is not enabled manual refresh is recommended after editing.

9.1. Showing the Differences

WinMerge uses different (user configurable) colors to highlight and select differences. By default WinMerge shows different lines with yellow background and missing lines with gray background. If user selects the difference, it is shown with red background and missing lines with milder red.

9.2. File Headerbar

The file headerbar has several functionalities. See screenshot below:

Headerbar shows full path to the open file. If the path is longer than available space one part of the path is replaced with an ellipsis (...). Headerbar also shows:

Headerbar has a context menu with items to copy full path or filename to clipboard.

9.3. Statusbar

Statusbar upper line shows information about current line. In first pane:

Note

Col counts TAB as X chars (as defined in editor options) and Ch counts TAB as one.

Next two panes show RO if file is protected and file's EOL style ("DOS/UNIX/MAC"). Note these two different ways to show EOL style. When per-line EOL style is not remembered, EOL style is shown on own pane in statusbar. And when per-line EOL style is remembered line's EOL style is shown after char number. When per-line EOL style is used there is no file-wide EOL style.

Difference between column and char is that column counts tabulator character as so many (space) chars as it occupies (4 by default, can be changed from options). But char count counts tabulator char as one char.

Lower line in statusbar shows current difference and amount of differences. Text can be:

9.4. Difference Navigation

Difference navigation commands are in Merge menu:

9.4.1. Selecting a difference

Before difference can be merged, it must be selected. Selecting can happen by difference navigation keys/items (see below) or by selecting wanted difference directly:

  • Double-click over difference with mouse

  • Move cursor inside difference and select it with Current Difference.

9.4.2. Navigating differences

Merge-menu has items for navigating to next/previous and first/last difference. Navigation is always done based on current cursor location. So Next Difference-command selects next difference from cursor, not from current selected difference.

Note

When difference is selected with navigation commands cursor is moved to begin of first line of difference. In both files.

9.4.3. Current Difference-command

This command has two important functions:

  • When there is no difference selected and cursor is inside difference, it selects this difference. This is very handy way to select difference from keyboard.

  • When there is selected difference, it scrolls to selected difference. This is handy if user has scrolled selected difference out of screen. So this allows user to scroll files to see other contents and quickly return back to selected difference.

9.4.4. Go To line or difference

Using Go To from Edit-menu user can jump to certain line or difference. Go To -dialog prefills current line and side to Go To -dialog.

Tip

Go To line number is useful if there is need to merge same change to several target files from one original file. Rather than using Find or difference navigation it is faster to jump to first line of difference.

9.5. Merging Differences

Merging commands are located in Merge-menu after navigation commands. Basically there are only two types of merging commands - copy difference from right to left and copy difference from left to right. Additional commands make merging several differences easier.

Copy to Right and Copy to Left copy difference from side to side. At simplest this means replacing text in destination difference with text in source difference. But because difference can contain also removed lines, new lines may be created or some lines removed. If there are several differences selected, then all fully selected differences are merged with one command. This makes merging many small differences a lot faster.

WinMerge rescans files after every merging operation. This is done to ensure differences were copied correctly and all changes after last rescanning are taken care of. If Automatic rescan-option is not set, user may have edited files and differences may not have shown correctly before merging. If result of merging is not what were wanted, user can undo merging operation.

Important

It is strongly advised to run Rescan (F5) before merging differences if Automatic rescan is set off. Usually files get out of sync when editing and merging differences may have unpredictable results. If merging result looks incorrect try undoing (Edit->Undo from menu or Ctrl-Z) it and rescanning files. And then merging again.

Copy to Right/Left and Advance-commands merge current difference and then select next difference (if there is one). Using these commands makes merging several differences easier and faster.

Copy All to Right/Left-commands sync two open files by merging all differences. Note that you can undo this whole operation with one undo command.

Tip

Enable Automatically scroll to first difference -option from general options. This saves you from scrolling to first difference and selecting it. See Options & Configuration -chapter for more information.

9.6. Merge Mode

Merge mode can be enabled from the File-menu. It restores the WinMerge 1.7.1 single keys for difference merging and navigating:

Unlike the normal mode, in this schema the Alt-key is not needed for these basic operations (which makes them quicker and more convenient). Note that Shift-Arrow, Alt-Arrow and Ctrl-Alt-Arrow keys work in merge mode like in normal mode.

When merge mode is enabled Merge text is shown in statusbar.

9.7. Refreshing

Refreshing updates differences after changes are made to files. Its important to do refresh before merging changes between files.

Note

Refresh does not reload file. That means, if another programs has updated files etc, those changes are not seen. Refresh updates differences according changes user has done.

9.8. View Whitespaces

When enabled from View menu View Whitespace feature shows all whitespace characters (spaces, tabulators, line ends). This is very useful for example when there are spaces in other file and tabulators in other. Also, if Preserve original EOL chars is enabled, WinMerge shows type of EOL (DOS/UNIX/MAC).

9.9. Editing Files

Normal editing features work in WinMerge editor. User can type and delete text, select text, copy, cut and paste text etc. There is some customisation because there can be removed lines in files (lines existing only in other side). Anyway these customisations are not usually visible to users otherwise that lines can sometimes "jump" when WinMerge has to relocate matching/non-matching files.

9.10. Line Difference Highlight

Maybe the greatest new feature in WinMerge 2.4 is the difference highlight in all differences of the files.

This feature can be enabled and disabled from menu View->View Line Differences.

With default settings WinMerge uses whitespace characters (namely spaces and tabulators) to separate words. WinMerge does not consider commas or dots as word separators. That means WinMerge thinks "For Example" is two words but "For,Example" is one word. More characters can be included as word-separator characters from editor options (select from menu Edit->Options and Editor page). See Options & Configuration -chapter for more information.

9.11. Line Difference Selection

Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines. This feature is called Highlight File Diff. It is available in Edit-menu, toolbar and shortcut key (F4). In screenshot below there is one difference highlighted. First time whole difference area in one line is highlighted. Repeating cycles through individual changed words.

9.12. Context Menu

File compare context menu contains items for frequently used features:

Most of these items are familiar from Main menu. Worth noting is last item Open. It allows to open file with (system) registered application or with external editor. Also context menu merge-commands are not relative to active file. They always merge the selected difference.

9.13. Fonts

Font used by editor can be changed from View->Select Font.... Due to limitations in the editor, only fixed width fonts are supported in WinMerge.

Font suggestions for use of WinMerge with East Asian languages: