SourceGear DiffMerge
User Manual, Version 4.2
SourceGear DiffMerge: User Manual, Version 4.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-2013 SourceGear LLC. All rights reserved.
iii
Table of Contents
Contact Information ........................................................................................................... vi
1. Introduction ................................................................................................................... 1
2. Installation ..................................................................................................................... 4
Windows ................................................................................................................... 4
Macintosh ................................................................................................................. 4
Ubuntu and Mint Linux ............................................................................................... 5
Fedora Linux ............................................................................................................. 6
3. Registration ................................................................................................................... 8
4. 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 .............................................................................................. 10
File Panels ....................................................................................................... 11
The Glance Bar ................................................................................................ 11
The View Selector ............................................................................................ 12
Ruleset Indicator ............................................................................................... 12
Character Encoding Indicator .............................................................................. 12
The Splitter ...................................................................................................... 13
The Toolbar ..................................................................................................... 14
Showing Changes ..................................................................................................... 14
Detail Level ..................................................................................................... 14
Highlighting Changes ........................................................................................ 16
Aggregating Changes ......................................................................................... 16
Manual Alignment Markers ................................................................................ 16
The Line Display Mode ..................................................................................... 18
Omitted Lines .................................................................................................. 19
Hiding Unimportant Differences .......................................................................... 19
Change Ruleset ................................................................................................ 21
Exporting File Differences .......................................................................................... 21
File Editing .............................................................................................................. 22
Interactive Editing ............................................................................................. 22
Patching .......................................................................................................... 23
Merge to Center Panel (Auto-Merge) ................................................................... 23
Undo/Redo ...................................................................................................... 24
Moving Around within Files ....................................................................................... 24
5. The Folder Diff Window ................................................................................................ 26
Opening Folder Diff Windows .................................................................................... 26
Parts of a Folder Diff Window .................................................................................... 27
Folder Listing .................................................................................................. 27
The Toolbar ..................................................................................................... 28
Other Menu Commands ..................................................................................... 29
Context Menus ................................................................................................. 29
Export Commands .................................................................................................... 30
6. The Options Dialog ....................................................................................................... 32
The File Windows Page ............................................................................................. 32
Fonts .............................................................................................................. 33
Window Options ............................................................................................... 33
The Rulesets Page ..................................................................................................... 34
Default Ruleset ................................................................................................. 35
SourceGear DiffMerge
iv
Custom Rulesets ............................................................................................... 35
The Detail Level Page ............................................................................................... 37
Analysis Detail Level ........................................................................................ 37
Multi-Line Intra-Line Analysis Detail Level .......................................................... 38
Intra-line Smoothing Threshold ........................................................................... 39
Inter-line Smoothing Threshold ........................................................................... 39
The Line Colors Page ................................................................................................ 40
The Intra-Line Colors Page ........................................................................................ 41
The Other Colors Page .............................................................................................. 42
The Folder Windows Page ......................................................................................... 43
Fonts .............................................................................................................. 44
Window Options ............................................................................................... 44
The Folder Filters Page .............................................................................................. 45
Filename Filters ................................................................................................ 46
Sub-folder Filters .............................................................................................. 46
Ignore Case ..................................................................................................... 46
The Folder Colors Page ............................................................................................. 47
The Equivalence Mode Page ....................................................................................... 47
The Messages Page ................................................................................................... 49
The Explorer Integration Page ..................................................................................... 50
Personal Settings .............................................................................................. 51
Using Explorer Integration ................................................................................. 51
The External Tools Page ............................................................................................ 53
7. Rulesets ....................................................................................................................... 56
Overview ................................................................................................................. 56
The Ruleset Dialog ................................................................................................... 56
The Name Page ................................................................................................ 56
The Character Encodings Page ............................................................................ 57
The Lines to Omit Page ..................................................................................... 60
The Line Handling Page .................................................................................... 61
The Content Handling Page ................................................................................ 63
Equivalence Mode ............................................................................................ 66
8. External Tools .............................................................................................................. 67
Overview ................................................................................................................. 67
Launching an External Tool ........................................................................................ 67
The External Tools Dialog ......................................................................................... 67
The Name Page ................................................................................................ 67
The Diff Page .................................................................................................. 68
The Merge Page ............................................................................................... 70
9. Printing ....................................................................................................................... 72
Printing File Windows ............................................................................................... 72
Printing Folder Windows ........................................................................................... 74
10. Command Line Arguments ............................................................................................ 76
Opening an Empty Window ........................................................................................ 76
Opening a Diff Window ............................................................................................ 76
Opening a Merge Window ......................................................................................... 77
Showing Help .......................................................................................................... 78
Diffing Files to a File ................................................................................................ 78
Diffing Folders to a File ............................................................................................ 79
11. Integration with Third-Party Software ............................................................................. 80
GIT ........................................................................................................................ 80
Settings for OS X ............................................................................................. 80
Settings for Linux ............................................................................................. 80
Settings for Windows ........................................................................................ 81
SourceGear DiffMerge
v
Mercurial (Hg) ......................................................................................................... 82
Settings for Linux and OS X .............................................................................. 83
Settings for Windows ........................................................................................ 83
Mercurial Tips .................................................................................................. 84
TortoiseSVN ............................................................................................................ 84
Microsoft TFS .......................................................................................................... 85
Microsoft VSS 2005 .................................................................................................. 85
12. Release Notes ............................................................................................................. 87
Release 4.2.0 - October 2013 ...................................................................................... 87
Release 4.1.0 - August 2013 ....................................................................................... 88
Release 4.0.0 - June 2013 .......................................................................................... 90
Release 3.3.2 - December 2011 ................................................................................... 92
Release 3.3.1 - July 2011 ........................................................................................... 93
Release 3.3.0 - April 2009 .......................................................................................... 95
Release 3.2.0 - May 2008 .......................................................................................... 96
Release 3.1.0 - October 2007 ...................................................................................... 97
Release 3.0.2 - July 2007 ........................................................................................... 99
Release 3.0.0 - June 2007 ......................................................................................... 100
A. SourceGear License Agreement .................................................................................... 102
评论0