Diff tools

Version 3 (sbsmac, 07/19/2009 16:15)

1 1 kju
h1. Diff Tools
2 1 kju
3 2 kju
{{>toc}}
4 1 kju
5 1 kju
h2. Essential features
6 1 kju
7 1 kju
h3. Diff
8 1 kju
9 1 kju
h3. Merge
10 1 kju
11 1 kju
h2. Tools matrix
12 1 kju
13 1 kju
h2. Tools
14 1 kju
15 1 kju
h3. TortoiseIDiff
16 1 kju
17 1 kju
h3. KDiff3
18 1 kju
19 1 kju
h3. WinMerge
20 1 kju
21 1 kju
h3. P4Merge
22 1 kju
23 1 kju
!http://www.perforce.com/images/products/p4merge/main.gif!
24 1 kju
25 1 kju
"Home Site":http://www.perforce.com/perforce/products/merge.html
26 1 kju
27 1 kju
"Download › Clients › Visual Merge Tool  ":http://www.perforce.com/perforce/downloads/component.html
28 1 kju
29 1 kju
* Tab spacing and whitespace differences
30 1 kju
  With P4Merge, users can choose to include or ignore both line ending or whitespace differences.
31 1 kju
* Line ending options for merged files
32 1 kju
  Perforce supports Windows (CRLF), Mac (CR), and Unix (LF) line ending conventions.
33 1 kju
* Support for line numbering
34 1 kju
  Display line numbers when comparing and merging files.
35 1 kju
* Character encoding preference
36 1 kju
  Users can select the appropriate character encoding to use with the merged file.
37 1 kju
* Run as standalone tool
38 1 kju
  P4Merge accepts command-line parameters and can be used from non-Peforce applications.
39 1 kju
* Support for third party merge tools
40 1 kju
  Perforce client programs can be configured to work with most merge tools by setting a
41 1 kju
  single environment variable (see table below for merge tools that are known to work with Perforce).
42 1 kju
* Perforce Command-Line Client (Perforce Software)
43 1 kju
  Perforce's "p4 resolve":http://www.perforce.com/perforce/doc.current/manuals/cmdref/resolve.html#1040665 command includes built-in merge capability for the console environment. 
44 1 kju
45 1 kju
h3. Araxis Merge
46 1 kju
47 1 kju
"Home site":http://www.araxis.com/merge/topic_features.html 
48 1 kju
49 1 kju
Araxis Merge is a two-way and three-way file comparison/merging application with
50 1 kju
integrated folder synchronization. Features include detailed highlighting of
51 1 kju
changes within lines, point-and-click merging, automatic merging, and support for MBCS/Unicode. 
52 1 kju
53 1 kju
h3. Guiffy
54 1 kju
55 1 kju
"Home site":http://www.guiffy.com/
56 1 kju
57 1 kju
Guiffy is a platform-independent graphical, three-way file comparison and merging tool. Guiffy also supports folder/file tree comparison, merge, and synchronization. 
58 3 sbsmac
59 3 sbsmac
h3. BeyondCompare
60 3 sbsmac
61 3 sbsmac
"Home site":http://www.scootersoftware.com/
62 3 sbsmac
63 3 sbsmac
Note that this is NOT a free tool. However, it is extremely capable and I would highly recommend it.  A demo version is available.