SourceGear DiffMerge
iv
Next / Previous Conflict ..................................................................................... 26
Using the Glance Bar ........................................................................................ 26
4. The Folder Diff Window ................................................................................................ 27
Opening Folder Diff Windows .................................................................................... 27
Parts of a Folder Diff Window .................................................................................... 28
Folder Listing .................................................................................................. 29
The Toolbar ..................................................................................................... 29
Other Menu Commands ..................................................................................... 29
5. The Options Dialog ....................................................................................................... 31
The File Windows Page ............................................................................................. 31
Fonts .............................................................................................................. 32
Window Options ............................................................................................... 32
The Rulesets Page ..................................................................................................... 33
Default Ruleset ................................................................................................. 34
Custom Rulesets ............................................................................................... 34
The Detail Level Page ............................................................................................... 36
Analysis Detail Level ........................................................................................ 36
Multi-Line Intra-Line Analysis Detail Level .......................................................... 37
Intra-line Smoothing Threshold ........................................................................... 38
Inter-line Smoothing Threshold ........................................................................... 39
The Line Colors Page ................................................................................................ 39
The Intra-Line Colors Page ........................................................................................ 40
The Other Colors Page .............................................................................................. 41
The Folder Windows Page ......................................................................................... 42
Fonts .............................................................................................................. 43
Window Options ............................................................................................... 43
The Folder Filters Page .............................................................................................. 44
File Suffix Filters ............................................................................................. 45
Sub-folder Filters .............................................................................................. 45
The Folder Colors Page ............................................................................................. 45
The Equivalence Mode Page ....................................................................................... 46
File Equivalence Modes ..................................................................................... 47
The Messages Page ................................................................................................... 48
The Explorer Integration Page ..................................................................................... 49
System-wide Settings ......................................................................................... 50
Personal Settings .............................................................................................. 51
Using Explorer Integration ................................................................................. 51
The External Tools Page ............................................................................................ 52
Overall Configuration ........................................................................................ 53
6. Rulesets ....................................................................................................................... 55
Overview ................................................................................................................. 55
The Ruleset Dialog ................................................................................................... 55
The Name Page ................................................................................................ 55
The Character Encodings Page ............................................................................ 56
The Lines to Omit Page ..................................................................................... 59
The Line Handling Page .................................................................................... 60
The Content Handling Page ................................................................................ 62
Equivalence Mode ............................................................................................ 65
7. External Tools .............................................................................................................. 67
Overview ................................................................................................................. 67
Launching an External Tool ........................................................................................ 67
The External Tools Dialog ......................................................................................... 67
The Name Page ................................................................................................ 67
The Diff Page .................................................................................................. 68