Loadstaff47

This topic describes how to use the WinMerge File Compare window to compare and merge text files. To understand the basic concepts about differences discussed here, we suggest you read Overview of file comparing and merging first. See Overview of file comparing and merging for related information about hex files.

You can start a file compare operation from either the WinMerge window or a Command Prompt window.

Winmerge-development WinMerge 3.0 for the Mac Winmerge-development WinMerge 3.0 for the Mac. From: Sam Carleton - 2011-10-16 22:03:49. I need a diff tool that has a command line option to create and save a diff report that looks easy to read, something like the html report produced by WinMerge. I have a few hundred files that I need to compare and it's not practical to have to open the files and manually and save the report.

Click File → Open. Use the Select Files or Folders dialog to specify the left and right source files to compare. For more details about the Select Files or Folder dialog, see Opening files and folders.

Run WinMergeU.exe, which is in your WinMerge install directory. In your command arguments, include the left and right files to compare. For more information about using the command line, see Command line.

The File Compare window displays compared files in two File panes, side by side. The WinMerge toolbar and context menu provides functions for viewing, navigating, and merging differences. The screen shot below shows a comparison of two versions of a file.

The left and right File panes show the text contents and differences of the two files being compared. The File panes are the main area for navigating and merging differences, and also allow you to edit the text directly. This section describes the features that support these actions, and ways that you can customize the File panes.

The header at the top of each File pane shows the full path of the source file. The left and right file names are also identified in the header of the Compare Window, above the File panes.

One of the File panes is always active (indicated by the dark header background); the other is inactive and has a lighter header bar. You can edit only in the active pane (as described in File pane editing features). Click in either side to make it active and make the other side inactive.

An asterisk (*) before the filename in the header indicates that there are unsaved changes in the file.

The header bar's context menu has shortcuts that are useful for copying and pasting file information:

Copies the full path of the source file into the system clipboard.

Copies just the source filename into the system clipboard.

WinMerge highlights several types of differences in the File panes. The Colors page in the Options dialog defines a set of background and text colors for most difference types, with variations indicating their state: unselected, selected, or deleted. This section describes how each of the basic difference types is detected and displayed.

A difference block contains one or more contiguous lines that are different. The default difference background color is gold, but blank lines are marked with the deleted color.

For this and other screens in this section, we enabled View line numbers to show which lines in the source files are compared.

This comparison detects three difference blocks:

1. The first difference is a single line.

2. The blank line in file2 has no corresponding blank line in file1. WinMerge treats the missing blank line as a deleted difference, marked here with the default gray color.

3. The last difference block includes two lines.

This color marks content that you have configured WinMerge to ignore. In contrast to difference blocks, ignored content is not compared, it is simply highlighted to help you see what has been ignored. Ignored differences include:

• Blank lines, if you have enabled Ignore blank lines in the Options dialog Compare page.

• Differences that match patterns in line filters that you have defined (see Using Filters to learn how).

The next example repeats the previous comparison, this time with Ignore blank lines enabled. There are now only two differences. The blank line on the right side is marked with the Ignored Differences color.

Moved differences are identical lines found in different locations in the compared files, if Moved block detection is enabled in the Options dialog Compare page. The next screen shot repeats the previous comparison, this time with moved block detection enabled.

Notice that the two identical lines (containing a and c) that are in different locations are marked with the default orange moved color. Another effect of moved block detection in this case is that the last two lines are now two separate differences instead of a single difference block.

In some cases, showing moved differences can make it easier to visualize changes in files. However, too many moved lines might make your comparison hard to navigate. Use your own judgement!

WinMerge can mark the text that is changed with difference blocks. Line differences are marked with the word difference color. See Line difference highlighting for details.

WinMerge tries to match similar lines within difference blocks when you enable Match similar lines in the Options dialog Compare page. What does “similar” mean? Generally, this feature works best in simple cases, for example where lines that have strong similarities. When detected, similar lines are adjusted to align in the File pane. The next figure shows comparisons of the same two files, before and after enabling the Match similar lines option:

In the second comparison, the lines “mice” and “mice and a” are detected as similar. WinMerge adds blank lines in the display to make these lines appear at the same level within the difference block.

Sometimes it's useful to highlight not just difference blocks, but also the text within them that is changed. You can disable or enable them in two ways:

• Set all View line differences options in the Options dialog Editor page.

• Click View → View line differences to toggle line differences on or off.

Note

Remember that WinMerge navigation and merging functions (like Next Difference or Copy Left) work on difference blocks, not on line differences within them.

This section describes how line differences are detected and marked. Note that the effect of these options is also affected by your current whitespace settings in the Options dialog Compare page.

The following examples show how word-level line differences are displayed with each of the whitespace settings:

Example 1. Line differences with Whitespace: Compare

WinMerge detects all different words and spaces:

Example 2. Line differences with Whitespace: Ignore change

Multiple spaces and tabs are treated the same as a single space. In the example, the extra space between the last two words is not marked:

Example 3. Line differences with Whitespace: Ignoring all

No spaces between words are compared, so these lines are treated as identical:

A character-level line difference includes the first and last different characters in a word, and all the characters between them. A single character-level difference can span adjacent words. The following example illustrates:

Note

As with word-level line differences, character highlighting varies according to how WinMerge is configured to detect word breaks. In the example, the extra space after the word cure in file2 is highlighted only if whitespace is compared.

Words and characters in line differences can be separated by whitespace, or by a combination of whitespace and punctuation. Whitespace (the default) is the typical choice for comparing most text files. All the preceding line difference examples use whitespace to break words and characters.

In some cases it's useful to break at punctuation. For example, the next screen shot compares a comma-separated list. To highlight meaningful line differences, we have enabled Break at whitespace or punctuation in the Options dialog Editor page.

Although WinMerge is a not a full-featured editor or IDE, it does provide basic editing functions, like Undo and Redo, Find and Replace, and Goto. These basic editing tasks are often needed during merging (for example, to change text within differences). You can edit in the active File pane (remember, click in a pane to make it active). Changes are not written to a file until you save a pane to a result file.

WinMerge editing features also include syntax highlighting. This optional feature supports several file formats, and you can configure the colors used. Note that syntax highlighting is not applied within differences, as the preceding screen shot shows.

Tip

Make sure that Automatic rescan is enabled, as described in Rescanning files. If it is not, manually refresh your view (press F5) before and after editing a file, to ensure that WinMerge difference detection is up to date.

You can choose fonts for the File pane by clicking View → Select Font. WinMerge supports only fixed width fonts.

Here are font suggestions for using WinMerge with East Asian languages:

• Simplified Chinese: SimSun or SimHei fixed-width fonts
• Traditional Chinese: MingLiU fixed-width font
• Japanese: MS Gothic or MS Mincho fixed-width fonts
• Korean: GulimChe fixed-width font (not Gulim, because this variant uses proportional-spacing glyphs that are not centered in grid cells and poorly aligned in fixed-width mode).

The File panes have optional gray margins that show line numbers and some symbols. To show or hide the margins, clicking View → View Margins. If you are using multiple File Compare windows, you can control margins for each window independently. The margin can show any or all of these features:

• Line numbers, if View → View Line Numbers is enabled.

• Bookmarks, if Edit → Bookmarks is enabled. A bookmark is a blue circle, in the margin next to a line, that you can make WinMerge remember and return to.

  • To set a bookmark on a line, double-click in its margin (or press (Ctrl+F2). The same action deletes an existing bookmark.

  • To navigate bookmarks, click Edit → Bookmarks and choose Next or Previous.

  • Double-click a single bookmark to delete it (or press (Ctrl+F2).

  • Click Edit → Bookmarks → Clear All Bookmarks to delete all bookmarks.

• Word wrap arrow symbols, if View → Wrap Lines is enabled.

The following screen shot shows a margin with bookmarks and word wrap enabled. Without line numbers, the margin width is minimal.

The next screen shot shows a margin with bookmarks and line numbers enabled. Notice that the margin is wider. In fact, the margin is wide enough for the largest line number. Thus, the margins for large files with many lines can be quite wide.

The WinMerge toolbar and menus provide a range of functions to navigate, select, and merge differences within files.

Note

WinMerge shortcuts have the same names and buttons whether you open a Folder Compare or File Compare window. However, the functions behave differently: with a File Compare window, the functions operate on differences within files, not on differences within folders.

The difference functions you can use depend on your context, which often changes as you work. This means that a function is available only when its operation is possible for a given location or other condition in your WinMerge environment. For example, if you click in a line of text within a difference, you might notice several navigation and merge buttons become enabled in the toolbar. If you click in another area of text that is not within a difference, these functions become unavailable.

Difference functions are available in the WinMerge toolbar,and also through these alternate mechanisms:

• WinMerge menus, especially Merge

• Context menus within the File Compare window (when you right-click in text)

• Keyboard shortcuts

Difference functions are described in Navigating differences and Merging differences, later in this topic. Quick start and Overview of file comparing and merging provide examples of comparing and merging.

File → Merge Mode restores these WinMerge 1.7.1 single keyboard shortcuts for difference merging and navigating functions:

• Up and Down keys for the Previous Difference and Next Difference functions.
• Left and Right keys for the Copy Left and Copy Right functions.

Merge mode omits the Alt key for these common operations (making them quicker to use than the normal mode). Note that the Shift and AltArrow key combinations work in merge mode in the same way as normal mode.

Merge mode is indicated in the status bar by the text, Merge.

The Location pane, to the left of the File panes, maps the entire length of the compared files into two vertical bars (corresponding to the left and right File panes). It is especially useful for working with files that are too long to easily navigate in the File panes.

The Location pane shows several kinds of items:

Each difference block in the File panes is indicated in the Location pane by a horizontal line across each vertical bar. The thickness, color , and locations of these lines are clues about of the size (number of lines), types and distribution of all differences in the files. For example, the color of a line is the same as the color of the corresponding difference block. The Location pane in the preceding screen shot shows many basic differences (gold) and some empty difference blocks (gray).

If you have selected a difference, the Location pane marks the current difference line with a pair of small triangles on either side of the vertical bars. If you navigate to another difference, the pointer moves up or down with the location. Scrolling the File pane does not change the location of the difference pointer (or any of the difference lines) in the location pane.

The area of the files currently visible in the File panes is indicated by a shaded (translucent) view bar over the Location pane. The area bar's height and location correspond to the portion of the files that is visible in the scroll region. For example, you might see the bar expand or shrink if you change the height of your File panes. This synchronization of the Location pane view bar and File panes enables quick navigation, and some useful actions:

• When you scroll the File panes, the view area in the Location pane moves with it.

• Conversely, you can drag the view area bar in the Location pane up or down to scroll the File panes. This scrollbar thumb action is very handy for navigating long files.

• Click anywhere in the Location pane to jump to the corresponding location in the File panes.

Moved differences are identical lines in different locations. They are shown only if the Enable moved block detection is checked in the Options dialog Compare page. See Difference highlighting for more details about moved differences in the File pane. The Location pane draws a line connecting moved differences in the left and right location bars. For example:

The Location pane's context menu contains these shortcuts:

• Goto Line 1: Moves the cursor to the top of the file.

• Goto: Moves the cursor to a line you specify (described in Navigation functions).

• No Moved Blocks: Turns off moved difference color for moved blocks.

• All Moved Blocks: Turns on moved difference color for all moved blocks.

• Moved Block for Current Diff: Turns on moved difference color only for current selected moved difference.

The Diff pane shows the contents of the two sides of a selected difference.

When you select a difference, the two versions are loaded in the upper and lower sides of the Diff pane. In this way, the Diff pane confirms which lines are included in a difference, and lets you examine them in isolation from the rest of the file.

You can merge differences directly in the Diff pane by right-clicking in either the top or bottom side and choosing Copy to Right or Copy to Left.

Each File pane contains a status bar at the bottom. The status bar contains several panes with different types of information about the document and your location in it:

• Ln: Line number in the source file.

• Col: Column location of the cursor and the total number of columns in the line.

  Col counts tabs as n spaces, where n is the number of characters defined as the Tab size in the Editor page of WinMerge options (4 by default).

• Ch: Character location of cursor and the total number of chars in the line.

  Ch counts tabs as single tab characters.

• EOL: Linefeed style of the current line (shown only when the Preserve original EOL chars option is enabled in the Editor page of WinMerge options).

RO is shown in the pane if the file is set to read-only (as described in Protecting files). Otherwise the pane is empty.

Codepage number for ANSI files, Unicode encoding type for Unicode files.

EOL style of the file: Win for Windows/DOS files (CRLF), Unix (LF), Mac (CR), or Mixed.

Note

When the per-line EOL style is used, the file EOL style is not shown (this pane is blank).

When a File Compare window is open, the WinMerge window status bar shows one of these messages about the compared files:

• Identical: The files contain no differences

• n Differences Found: The number of differences detected, displayed only when no difference is selected.

• Difference x of n: The selected difference's sequence number in the total number of differences, starting with 1.

This section describes how to navigate and select differences in the File Compare window. Note that when you select a difference, it is always selected in both File panes.

Tip

To save time, enable Automatically scroll to first difference in the General page of WinMerge options. Then you don't have to manually navigate to the first difference and select it.

Here are the functions for navigating differences in the File Compare window, and their shortcuts in the toolbar and menus:

Enabled if you have clicked in (or selected) text within a difference in a File pane. Selects the word differences within the line. For example:

If you want to select the difference block itself, use Current Difference instead.

Shortcuts: button, Edit → Select Line Difference, F4, context menu in File pane within a difference.

Selects the next difference below your current cursor location in the document (not necessarily relative to the current difference). Use to step through differences sequentially from any point. Available except when the last difference is currently selected.

Shortcuts: button, Merge → Next Difference, Alt+Down (or Down in merge mode).

Selects the previous difference above your current cursor location (not necessarily relative to the current difference). Use to step backwards sequentially through differences. Available except when the first difference is currently selected.

Shortcuts: button, Merge → Previous Difference, Alt+Up (or Up in merge mode).

Use this to begin comparing or merging differences, or to locate the first difference from any other location. Available except when the first difference is currently selected. You can also select a difference by double-clicking its text.

Shortcuts: button, Merge → First Difference, Alt+Home.

This function has two modes of action:

• If your cursor is inside a difference but no difference is selected, this function selects the entire difference. This is a very handy way to select a difference using the keyboard.
• When there is a current difference, the function jumps to that location. This is handy if you have scrolled the selected difference out of view, and want to quickly return to its location.

Shortcuts: button, Merge → Current Difference, Alt+Enter.

Enabled except when the last difference is currently selected.

Shortcuts: button, Merge → Last Difference, Alt+End.

Enables you to jump to either a line number or a difference number (for example, difference 2 is the second difference). Opens the Go To dialog, where you specify the number, which file to use (either the left or right), and the type of location (either line or difference).

Tip

The Go To line number can be useful when you need to merge the same change from one file to several target files. Jumping to a particular difference can be quicker than using Find to search text, or stepping through differences.

Shortcuts: Edit → Go to, Ctrl+G, context menu in File pane and Location pane.

See Merge functions.

TBD

Merging copies differences from one File pane to the other: either left to right, or right to left. This is different from directly editing text using WinMerge's editing functions (described earlier in this topic).

By default, the Automatic rescan option is enabled in the Editor page of WinMerge options. Rescanning keeps your your compare and merge operations up to date. Without rescanning, WinMerge differences does not detect changes that might occur to files while you are comparing them, for example in an external editor.

Rescanning occurs when you perform certain actions (like merging a difference or editing a file) during a file compare. If a file has changed, WinMerge displays a dialog advising you that another application has updated the file, and asks whether you want to reload the file.

Click to reload the file before proceeding, or to ignore the changes and work with the earlier loaded version of the file.

Important

If Automatic rescan is disabled, or if you suspect that a file might have changed, we strongly advise that you run Refreshbefore performing any merge operation: click Edit → Refresh or the toolbar button, or press F5.

If a merge result looks incorrect, click Edit → Undo or press Ctrl+Z to undo the merge. Then rescan the files and try merging again.

The merging functions can implicitly select differences based on a cursor location or text selection. For example, if you click anywhere in a difference and then click the toolbar button, the entire difference block is merged. This makes it easy to merge many small differences. Similarly, if you select text that spans all or part of multiple differences, all the included differences are merged with a single merge command.

If the result of a merge operation is not what you expected, you can click to reverse the operation.

Cached

Here are the merge functions and their shortcuts in the toolbar and menus:

Copies one or more difference from left to right. Note that differences do not need to be fully selected: At its simplest, this means replacing text in the target difference with text in source difference. But because differences can also contain empty lines, new lines may be created or removed.

Shortcuts: button, Merge → Copy to Right, Alt+Right ( or Right in merge mode), context menu in File pane within a difference, and in Diff pane.

Copies the current difference from the right to the left File pane. See Copy Right description for details.

Shortcuts: button, Merge → Copy to Left, Alt+Left (or Left in merge mode), context menu in File pane within a difference, and in Diff pane.

Merges the current difference from the right to the left File pane, then selects the next difference (if one exists). Equivalent to Copy Right and Next Difference in one step.

Shortcuts: button, Merge → Copy to Left, Ctrl+Alt+Right, context menu in File pane within a difference.

Merges the current difference from left to right, then selects the next difference (if one exists). Equivalent to Copy Left and Next Difference in one step.

Shortcuts: button, Merge → Copy to Left, Ctrl+Alt+Left, context menu in File pane within a difference.

Copies all differences from the left to the right File pane. Use to synchronize two files with one command. Similarly, you can back out the entire merge by clicking the Undo or pressing Ctrl+Z.

Shortcuts: button, Merge → Copy to Left, Alt+Left, context menu in File pane within a difference.

Copies all differences from the right to the left File pane. Effectively, replaces the content of the left File pane. See similar to All Right.

Shortcuts: button, Merge → Copy to Left, Alt+Left, context menu in File pane within a difference.

Rescans files to update differences. Use after changes are made to files, if automatic scanning is disabled (see Rescanning files for details).

Shortcuts: button, View → Refresh, F5.

You can use WinMerge to resolve conflict files that some version control systems produce during their merge operations. A conflict file is created when a merge encounters differences that cannot be automatically resolved. It is a single file containing the incompletely merged content of the two files. WinMerge separates the conflict file into separate files and opens those files in file Compare window. You can then use WinMerge's compare and merge functions to resolve the conflicts and save the merged result file.

1. Click File → Open Conflict File, and use the Open dialog to select the conflict file in your file system. The conflict file opens in the File Compare window:

   • The left File pane file header is titled, Theirs File. This side represents the file that is usually in the version control system's repository. This file usually cannot be edited, so WinMerge sets the left File pane to be read-only. This means that differences can be merged only from this file to the other file.

   • The right File pane is titled, Mine File. This side is the working copy of the file. All changes should be done to this file, which is the result file.

     The Mine File side is set to modified after opening conflict file (you will notice the asterisk in the File pane header). This allows you to save the file quickly if the it does not require any changes. It also ensures that you do not forget to resolve the files. If you choose not to save the file, the original conflict file is not modified.

2. Use all the normal compare and merge functions described earlier in this topic to resolve the conflicts in the Mine File pane.

3. When you are done, click Ctrl+S to save the Mine File side as the result file. By default, the new version overwrites the original conflict file. Alternatively, you can click File → Save Right → Save As, and choose a different file name.

Winmerge For Mac Os X

Many version control systems allow you to configure an external merge tool. If yours does, you might be able to have your version control system launch WinMerge automatically when a merge conflict occurs.

You can also open a conflict file from the WinMerge command line, which accepts three filename parameters: Theirs, Mine, and optionally, Resolved (if you want a different result file from the conflict file). For more information, see Command line. Single path to the conflict file is also accepted in command line.