SourceGear DiffMerge
User Manual, Version 3.3.2
SourceGear DiffMerge: User Manual, Version 3.3.2
The Release Notes for this and previous releases can be found near the end of this document.
____________________________
This copy of DiffMerge is licensed to you under the terms listed in the License Agreement at the end of this document.
SourceGear® is a registered trademark of SourceGear LLC.
SourceGear DiffMerge™ is a trademark of SourceGear LLC.
Copyright (C) 2003-2011 SourceGear LLC. All rights reserved.
iii
Table of Contents
SourceGear Contact Information .......................................................................................... vi
1. Introduction ................................................................................................................... 1
Summary .................................................................................................................. 1
Screen Shots .............................................................................................................. 2
On Windows ..................................................................................................... 2
On Mac OS X ................................................................................................... 3
On Ubuntu Linux ............................................................................................... 4
On Fedora Linux ................................................................................................ 5
2. Installation ..................................................................................................................... 6
Windows ................................................................................................................... 6
Using the MSI Package: ...................................................................................... 6
Using the ZIP Archive: ....................................................................................... 6
Linux ....................................................................................................................... 7
Ubuntu ............................................................................................................. 7
Fedora .............................................................................................................. 7
Macintosh ................................................................................................................. 7
Using the DMG ................................................................................................. 7
Using the PKG .......................................................................................................... 8
3. File Diff/Merge Windows ................................................................................................. 9
File Window Types .................................................................................................... 9
File Diff Windows .............................................................................................. 9
File Merge Windows ........................................................................................... 9
Opening File Windows .............................................................................................. 10
Parts of a File Window .............................................................................................. 11
File Panels ....................................................................................................... 11
The Glance Bar ................................................................................................ 12
The View Selector ............................................................................................ 13
Ruleset Indicator ............................................................................................... 13
Character Encoding Indicator .............................................................................. 13
The Splitter ...................................................................................................... 14
The Toolbar ..................................................................................................... 15
Other Menu Commands ..................................................................................... 16
Showing Changes ..................................................................................................... 16
Detail Level ..................................................................................................... 16
Highlighting Changes ........................................................................................ 18
Aggregating Changes ......................................................................................... 18
Manual Alignment Markers ................................................................................ 18
The Line Display Mode ............................................................................................. 20
Omitted Lines .......................................................................................................... 21
Hide Omitted Lines ........................................................................................... 21
Hiding Unimportant Differences .................................................................................. 21
File Editing .............................................................................................................. 23
Interactive Editing ............................................................................................. 23
Patching .......................................................................................................... 23
Merge to Center Panel (Auto-Merge) ................................................................... 24
Undo/Redo ...................................................................................................... 24
Moving Around within Files ....................................................................................... 24
The Find Dialog ............................................................................................... 25
Find Next / Find Previous .................................................................................. 25
The Go-To-Line Dialog ..................................................................................... 25
Next / Previous Change ...................................................................................... 26
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
SourceGear DiffMerge
v
The Merge Page ............................................................................................... 70
8. Printing ....................................................................................................................... 72
Printing File Windows ............................................................................................... 72
Printing Folder Windows ........................................................................................... 73
9. Command Line Arguments ............................................................................................. 75
Opening an Empty Window ........................................................................................ 75
Synopsis .......................................................................................................... 75
Exit Status ....................................................................................................... 75
Opening a Diff Window ............................................................................................ 75
Synopsis .......................................................................................................... 75
Flags .............................................................................................................. 75
Exit Status ....................................................................................................... 76
Opening a Merge Window ......................................................................................... 76
Synopsis .......................................................................................................... 76
Flags .............................................................................................................. 76
Exit Status ....................................................................................................... 77
Showing Help .......................................................................................................... 77
Synopsis .......................................................................................................... 77
Exit Status ....................................................................................................... 77
Diffing to a File ....................................................................................................... 77
Synopsis .......................................................................................................... 77
Flags .............................................................................................................. 77
Exit Status ....................................................................................................... 78
10. Integration with Third-Party Software ............................................................................. 79
Microsoft TFS .......................................................................................................... 79
TortoiseSVN ............................................................................................................ 79
Mercurial ................................................................................................................. 80
Settings for Linux and Mac OS X ....................................................................... 80
Settings for Windows ........................................................................................ 81
Tips ................................................................................................................ 81
11. Release Notes ............................................................................................................. 82
Release 3.3.2 - December 2011 ................................................................................... 82
Release 3.3.1 - July 2011 ........................................................................................... 83
Release 3.3.0 - April 2009 .......................................................................................... 84
Release 3.2.0 - May 2008 .......................................................................................... 85
Release 3.1.0 - October 2007 ...................................................................................... 87
Release 3.0.2 - July 2007 ........................................................................................... 88
Release 3.0.0 - June 2007 .......................................................................................... 89
A. Regular Expressions ...................................................................................................... 92
B. SourceGear License Agreement ...................................................................................... 94
- 1
- 2
前往页