Package org.eclipse.jgit.internal.diffmergetool

Enum CommandLineDiffTool

java.lang.Object

java.lang.Enum<CommandLineDiffTool>

org.eclipse.jgit.internal.diffmergetool.CommandLineDiffTool

All Implemented Interfaces:

Serializable, Comparable<CommandLineDiffTool>

public enum CommandLineDiffTool
extends Enum<CommandLineDiffTool>

Pre-defined command line diff tools. Adds same diff tools as also pre-defined in C-Git

see "git-core\mergetools\"

see links to command line parameter description for the tools

 araxis
 bc
 bc3
 codecompare
 deltawalker
 diffmerge
 diffuse
 ecmerge
 emerge
 examdiff
 guiffy
 gvimdiff
 gvimdiff2
 gvimdiff3
 kdiff3
 kompare
 meld
 opendiff
 p4merge
 tkdiff
 vimdiff
 vimdiff2
 vimdiff3
 winmerge
 xxdiff
 

Enum Constant Summary

Enum Constants

Enum Constant	Description
araxis	See: https://www.araxis.com/merge/documentation-windows/command-line.en
bc	See: https://www.scootersoftware.com/v4help/index.html?command_line_reference.html
bc3	See: https://www.scootersoftware.com/v4help/index.html?command_line_reference.html
codecompare	See: https://www.devart.com/codecompare/docs/index.html?comparing_via_command_line.htm
deltawalker	See: https://www.deltawalker.com/integrate/command-line
diffmerge	See: https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html
diffuse	See: http://diffuse.sourceforge.net/manual.html#introduction-usage
ecmerge	See: http://www.elliecomputing.com/en/OnlineDoc/ecmerge_en/44205167.asp
emerge	See: https://www.gnu.org/software/emacs/manual/html_node/emacs/Overview-of-Emerge.html
examdiff	See: https://www.prestosoft.com/ps.asp?page=htmlhelp/edp/command_line_options
guiffy	See: https://www.guiffy.com/help/GuiffyHelp/GuiffyCmd.html
gvimdiff	See: http://vimdoc.sourceforge.net/htmldoc/diff.html
gvimdiff2	See: http://vimdoc.sourceforge.net/htmldoc/diff.html
gvimdiff3	See: http://vimdoc.sourceforge.net/htmldoc/diff.html
kdiff3	See: http://kdiff3.sourceforge.net/doc/documentation.html
kompare	See: https://docs.kde.org/trunk5/en/kdesdk/kompare/commandline-options.html
meld	See: http://meldmerge.org/help/file-mode.html
opendiff	See: http://www.manpagez.com/man/1/opendiff/
p4merge	See: https://www.perforce.com/manuals/v15.1/cmdref/p4_merge.html
tkdiff	See: http://linux.math.tifr.res.in/manuals/man/tkdiff.html
vimdiff	See: http://vimdoc.sourceforge.net/htmldoc/diff.html
vimdiff2	See: http://vimdoc.sourceforge.net/htmldoc/diff.html
vimdiff3	See: http://vimdoc.sourceforge.net/htmldoc/diff.html
winmerge	See: http://manual.winmerge.org/Command_line.html
xxdiff	See: http://furius.ca/xxdiff/doc/xxdiff-doc.html

Method Summary

Modifier and Type	Method	Description
String	getParameters()
String	getPath()
static CommandLineDiffTool	valueOf(String name)	Returns the enum constant of this type with the specified name.
static CommandLineDiffTool[]	values()	Returns an array containing the constants of this enum type, in the order they are declared.

Methods inherited from class java.lang.Enum

clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Enum Constant Detail

araxis

public static final CommandLineDiffTool araxis

See: https://www.araxis.com/merge/documentation-windows/command-line.en

bc

public static final CommandLineDiffTool bc

See: https://www.scootersoftware.com/v4help/index.html?command_line_reference.html

bc3

public static final CommandLineDiffTool bc3

See: https://www.scootersoftware.com/v4help/index.html?command_line_reference.html

codecompare

public static final CommandLineDiffTool codecompare

See: https://www.devart.com/codecompare/docs/index.html?comparing_via_command_line.htm

deltawalker

public static final CommandLineDiffTool deltawalker

See: https://www.deltawalker.com/integrate/command-line

diffmerge

public static final CommandLineDiffTool diffmerge

See: https://sourcegear.com/diffmerge/webhelp/sec__clargs__diff.html

diffuse

public static final CommandLineDiffTool diffuse

See: http://diffuse.sourceforge.net/manual.html#introduction-usage

ecmerge

public static final CommandLineDiffTool ecmerge

See: http://www.elliecomputing.com/en/OnlineDoc/ecmerge_en/44205167.asp

emerge

public static final CommandLineDiffTool emerge

See: https://www.gnu.org/software/emacs/manual/html_node/emacs/Overview-of-Emerge.html

examdiff

public static final CommandLineDiffTool examdiff

See: https://www.prestosoft.com/ps.asp?page=htmlhelp/edp/command_line_options

guiffy

public static final CommandLineDiffTool guiffy

See: https://www.guiffy.com/help/GuiffyHelp/GuiffyCmd.html

gvimdiff

public static final CommandLineDiffTool gvimdiff

See: http://vimdoc.sourceforge.net/htmldoc/diff.html

gvimdiff2

public static final CommandLineDiffTool gvimdiff2

See: http://vimdoc.sourceforge.net/htmldoc/diff.html

gvimdiff3

public static final CommandLineDiffTool gvimdiff3

See: http://vimdoc.sourceforge.net/htmldoc/diff.html

kdiff3

public static final CommandLineDiffTool kdiff3

See: http://kdiff3.sourceforge.net/doc/documentation.html

kompare

public static final CommandLineDiffTool kompare

See: https://docs.kde.org/trunk5/en/kdesdk/kompare/commandline-options.html

meld

public static final CommandLineDiffTool meld

See: http://meldmerge.org/help/file-mode.html

opendiff

public static final CommandLineDiffTool opendiff

See: http://www.manpagez.com/man/1/opendiff/

Hint: check the ' | cat' for the call

p4merge

public static final CommandLineDiffTool p4merge

See: https://www.perforce.com/manuals/v15.1/cmdref/p4_merge.html

tkdiff

public static final CommandLineDiffTool tkdiff

See: http://linux.math.tifr.res.in/manuals/man/tkdiff.html

vimdiff

public static final CommandLineDiffTool vimdiff

See: http://vimdoc.sourceforge.net/htmldoc/diff.html

vimdiff2

public static final CommandLineDiffTool vimdiff2

See: http://vimdoc.sourceforge.net/htmldoc/diff.html

vimdiff3

public static final CommandLineDiffTool vimdiff3

See: http://vimdoc.sourceforge.net/htmldoc/diff.html

winmerge

public static final CommandLineDiffTool winmerge

See: http://manual.winmerge.org/Command_line.html

Hint: check how 'mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"' works

xxdiff

public static final CommandLineDiffTool xxdiff

See: http://furius.ca/xxdiff/doc/xxdiff-doc.html

Method Detail

values

public static CommandLineDiffTool[] values()

Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows:

for (CommandLineDiffTool c : CommandLineDiffTool.values())
    System.out.println(c);

Returns:

an array containing the constants of this enum type, in the order they are declared

valueOf

public static CommandLineDiffTool valueOf(String name)

Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)

Parameters:

name - the name of the enum constant to be returned.

Returns:

the enum constant with the specified name

Throws:

IllegalArgumentException - if this enum type has no constant with the specified name

NullPointerException - if the argument is null

getPath

public String getPath()

Returns:

path

getParameters

public String getParameters()

Returns:

parameters as one string