diffmerge (1)

Leading comments

SourceGear DiffMerge
Revision 4.2.0.697 stable
Copyright (C) 2003-2013 SourceGear LLC. All Rights Reserved.
================================================================

(The comments found at the beginning of the groff file "man1/diffmerge.1".)

NAME

diffmerge - File Diff/Merge

SYNOPSIS

/usr/bin/diffmerge [options] [pathname1 [pathname2 [pathname3]]]

DESCRIPTION

SourceGear diffmerge is a tool that lets you compare 2 folders for differences, compare 2 files for differences, and perform 3 way file merges. For complete details, see /usr/share/doc/diffmerge/DiffMergeManual.pdf.

OPTIONS

-h, -help, --help

Raises usage dialog and exits.

-c=STRING, -caption=STRING, --caption=STRING

Descriptive caption for the application title bar of the first window opened.

-m, -merge, --merge

Run "Merge to Center Panel" immediately after loading files in the first window opened. This option is only valid when 3 files are given.

-nosplash, --nosplash

Deprecated. Unused.

-r=PATHNAME, -result=PATHNAME, --result=PATHNAME

Specifies alternate pathname for saving the merge result from the first window. This option is only valid when 3 files are given. When this option is used, the exit status will reflect the state of the merge. Exit status is 0 if the merge is resolved; 1 if the merge is aborted; 2 if errors prevented the merge from starting; and 3 for command line errors.

-ro1, --ro1

Deprecated. Unused.

-ro2, --ro2

Treat the second pathname as read-only. Makes the first window opened a viewer only and prevents editing in it. This option is only valid when 2 or 3 files are given.

-ro3, --ro3

Deprecated. Unused.

-t1=STRING, -title1=STRING, --title1=STRING

Sets the display title for the first pathname. For file windows, this will replace the pathname displayed above the file. This is useful for labeling the screen when you are comparing historical versions of a file stored in temporary files. For folder windows, this will appear above the column headings. This option is only valid when pathnames are given.

-t2=STRING, -title2=STRING, --title2=STRING

Sets the display title for the second pathname. This option is only valid when pathnames are given.

-t3=STRING, -title3=STRING, --title3=STRING

Sets the display title for the third pathname. This option is only valid when pathnames are given.

BATCH OPTIONS

-d=PATHNAME, -diff=PATHNAME, --diff=PATHNAME

Compare two files and write results to an output file rather than opening a window. The file is only created if there are differences to report. Exit status is 0 the input files are identical; 1 when they are different; 2 when there are file errors; and 3 for command line errors.

-u, -unified, --unified

Write the --diff output file in UNIFIED format rather than TRADITIONAL format.

AUTHOR

diffmerge was developed by SourceGear, LLC.
Revision 4.2.0.697 stable
Copyright (C) 2003-2013 SourceGear LLC. All Rights Reserved.

SEE ALSO

www.sourcegear.com/diffmerge/index.html