Top Description Fields Constructors Methods
org.eclipse.jgit.internal.diffmergetool

public final Enum CommandLineDiffTool

extends Enum<CommandLineDiffTool>
Class Inheritance
Annotations
@SuppressWarnings:nls
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

Field Summary

Modifier and TypeField and Description
public static final CommandLineDiffTool
araxis

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

public static final CommandLineDiffTool
bc

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

public static final CommandLineDiffTool
bc3

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

public static final CommandLineDiffTool
codecompare

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

public static final CommandLineDiffTool
deltawalker

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

public static final CommandLineDiffTool
diffmerge

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

public static final CommandLineDiffTool
diffuse

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

public static final CommandLineDiffTool
ecmerge

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

public static final CommandLineDiffTool
emerge

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

public static final CommandLineDiffTool
examdiff

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

public static final CommandLineDiffTool
guiffy

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

public static final CommandLineDiffTool
gvimdiff

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

public static final CommandLineDiffTool
gvimdiff2

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

public static final CommandLineDiffTool
gvimdiff3

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

public static final CommandLineDiffTool
kdiff3

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

public static final CommandLineDiffTool
kompare

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

public static final CommandLineDiffTool
meld

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

public static final CommandLineDiffTool
opendiff

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

Hint: check the ' | cat' for the call

public static final CommandLineDiffTool
p4merge

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

private final String
parameters

private final String
path

public static final CommandLineDiffTool
tkdiff

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

public static final CommandLineDiffTool
vimdiff

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

public static final CommandLineDiffTool
vimdiff2

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

public static final CommandLineDiffTool
vimdiff3

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

public static final CommandLineDiffTool
winmerge

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

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

public static final CommandLineDiffTool
xxdiff

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

Constructor Summary

AccessConstructor and Description
private
CommandLineDiffTool(String path, String parameters)

private
CommandLineDiffTool(CommandLineDiffTool from)

private
CommandLineDiffTool(String path, CommandLineDiffTool from)

Method Summary

Modifier and TypeMethod and Description
public String

Returns:

parameters as one string
getParameters()

Get parameters

public String

Returns:

path
getPath()

Get path

public static CommandLineDiffTool
valueOf(String name)

public static CommandLineDiffTool[]
values()

Inherited from java.lang.Enum:
clonecompareTodescribeConstableequalsfinalizegetDeclaringClasshashCodenameordinaltoStringvalueOf

Field Detail

araxisback to summary
public static final CommandLineDiffTool araxis

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

bcback to summary
public static final CommandLineDiffTool bc

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

bc3back to summary
public static final CommandLineDiffTool bc3

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

codecompareback to summary
public static final CommandLineDiffTool codecompare

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

deltawalkerback to summary
public static final CommandLineDiffTool deltawalker

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

diffmergeback to summary
public static final CommandLineDiffTool diffmerge

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

diffuseback to summary
public static final CommandLineDiffTool diffuse

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

ecmergeback to summary
public static final CommandLineDiffTool ecmerge

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

emergeback to summary
public static final CommandLineDiffTool emerge

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

examdiffback to summary
public static final CommandLineDiffTool examdiff

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

guiffyback to summary
public static final CommandLineDiffTool guiffy

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

gvimdiffback to summary
public static final CommandLineDiffTool gvimdiff

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

gvimdiff2back to summary
public static final CommandLineDiffTool gvimdiff2

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

gvimdiff3back to summary
public static final CommandLineDiffTool gvimdiff3

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

kdiff3back to summary
public static final CommandLineDiffTool kdiff3

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

kompareback to summary
public static final CommandLineDiffTool kompare

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

meldback to summary
public static final CommandLineDiffTool meld

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

opendiffback to summary
public static final CommandLineDiffTool opendiff

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

Hint: check the ' | cat' for the call

p4mergeback to summary
public static final CommandLineDiffTool p4merge

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

parametersback to summary
private final String parameters
pathback to summary
private final String path
tkdiffback to summary
public static final CommandLineDiffTool tkdiff

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

vimdiffback to summary
public static final CommandLineDiffTool vimdiff

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

vimdiff2back to summary
public static final CommandLineDiffTool vimdiff2

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

vimdiff3back to summary
public static final CommandLineDiffTool vimdiff3

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

winmergeback to summary
public static final CommandLineDiffTool winmerge

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

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

xxdiffback to summary
public static final CommandLineDiffTool xxdiff

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

Constructor Detail

CommandLineDiffToolback to summary
private CommandLineDiffTool(String path, String parameters)
CommandLineDiffToolback to summary
private CommandLineDiffTool(CommandLineDiffTool from)
CommandLineDiffToolback to summary
private CommandLineDiffTool(String path, CommandLineDiffTool from)

Method Detail

getParametersback to summary
public String getParameters()

Get parameters

Returns:String

parameters as one string

getPathback to summary
public String getPath()

Get path

Returns:String

path

valueOfback to summary
public static CommandLineDiffTool valueOf(String name)
valuesback to summary
public static CommandLineDiffTool[] values()