Online Help :: ExamDiff Pro :: Home

This feature is only available in the Master edition of ExamDiff Pro.

Text Merge - General Options

Text Merge Options dialog

This dialog contains options for text file merge.

Dialog Box Options

Ignore
When parts of a text file are ignored, they are not compared. These options in this section, as well as the Ignore white space in lines, Ignore lines, and Ignore parts of each line sections, can be quickly disabled/enabled with the Use Ignores command.
  • Case
    Consider upper- and lower-case to be the same.

  • Linebreak styles
    Ignore linebreak styles: CRLF (DOS/Windows) vs. LF (Unix) vs. CR (Mac).

Ignore white space in lines
  • All
    Ignore all white space in lines.

  • Leading
    Ignore leading white space in lines.

  • Trailing
    Ignore trailing white space in lines.

  • Changes in amount
    Ignore changes in the amount of white space in lines.

Ignore parts of each line
  • Parts matching regular expression
    Ignore, in each line, parts matching a specified regular expression. For instance, specifying //.* as a regular expression will make ExamDiff Pro ignore all single-line C++-style comments.

  • Column ranges
    Ignore, in each line, all text in a certain range of columns. Use a comma-separated list of individual ranges, each of which is either a single number or a pair of dash-separated numbers. You can also prefix a range with "1:" or "2:" to apply it only to the first or to the second file (by default ranges apply to both files). Examples:
    • 2-7
    • 1:1-6,2:12,20-[6]
    • [m]-n is not a valid string, for any integers m and n.
Detail level for difference identification
View differences down to word or character level. Thus, if one letter is changed in a file, then you can choose whether only the line of the change is identified, the line and the word where the change occurred, or the line and the character where the change occurred. Alternatively, you can use the Detail Level drop-down toolbar button Detail Level toolbar button.


Plug-ins
  • Use plug-ins during comparison
    Check this option if you want to use plug-ins during prior to comparing files for merging.

Conflict resolution
Use these options to alter the conflict resolution behavior from using center file to using left or right file. You can also automatically mark every conflict as resolved. Note that these options only apply to three-way merge.

Contents|Index