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

public final Enum CommandLineMergeTool

extends Enum<CommandLineMergeTool>
Class Inheritance
Annotations
@SuppressWarnings:nls
Pre-defined merge tools. Adds same merge 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
tortoisemerge
vimdiff
vimdiff2
vimdiff3
winmerge
xxdiff

Field Summary

Modifier and TypeField and Description
public static final CommandLineMergeTool
araxis

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

public static final CommandLineMergeTool
bc

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

public static final CommandLineMergeTool
bc3

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

public static final CommandLineMergeTool
codecompare

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

public static final CommandLineMergeTool
deltawalker

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

Hint: $(pwd) command must be defined

public static final CommandLineMergeTool
diffmerge

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

public static final CommandLineMergeTool
diffuse

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

Hint: check the ' | cat' for the call

public static final CommandLineMergeTool
ecmerge

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

public static final CommandLineMergeTool
emerge

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

Hint: $(basename) command must be defined

public static final CommandLineMergeTool
examdiff

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

private final boolean
exitCodeTrustable

public static final CommandLineMergeTool
guiffy

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

public static final CommandLineMergeTool
gvimdiff

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

public static final CommandLineMergeTool
gvimdiff2

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

public static final CommandLineMergeTool
gvimdiff3

See:

public static final CommandLineMergeTool
kdiff3

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

public static final CommandLineMergeTool
meld

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

Hint: use meld with output option only (new versions)

public static final CommandLineMergeTool
opendiff

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

Hint: check the ' | cat' for the call

public static final CommandLineMergeTool
p4merge

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

Hint: check how to fix "no base present" / create_virtual_base problem

private final String
parametersWithBase

private final String
parametersWithoutBase

private final String
path

public static final CommandLineMergeTool
tkdiff

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

public static final CommandLineMergeTool
tortoisegitmerge

See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basics

Hint: merge without base is not supported

Hint: cannot diff

public static final CommandLineMergeTool
tortoisemerge

See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basics

Hint: merge without base is not supported

Hint: cannot diff

public static final CommandLineMergeTool
vimdiff

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

public static final CommandLineMergeTool
vimdiff2

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

public static final CommandLineMergeTool
vimdiff3

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

public static final CommandLineMergeTool
winmerge

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

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

public static final CommandLineMergeTool
xxdiff

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

Constructor Summary

AccessConstructor and Description
private
CommandLineMergeTool(String path, String parametersWithBase, String parametersWithoutBase, boolean exitCodeTrustable)

private
CommandLineMergeTool(String path, CommandLineMergeTool from)

Method Summary

Modifier and TypeMethod and Description
public boolean

Returns:

true if command with base present is valid, false otherwise
canMergeWithoutBasePresent()

Whether command with with base present is valid

public String

Returns:

parameters with or without base present
getParameters(boolean
return parameters with base present?
withBase)

Get parameters

public String

Returns:

path
getPath()

Get path

public boolean

Returns:

parameters
isExitCodeTrustable()

Whether exit code can be trusted

public static CommandLineMergeTool
valueOf(String name)

public static CommandLineMergeTool[]
values()

Inherited from java.lang.Enum:
clonecompareTodescribeConstableequalsfinalizegetDeclaringClasshashCodenameordinaltoStringvalueOf

Field Detail

araxisback to summary
public static final CommandLineMergeTool araxis

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

bcback to summary
public static final CommandLineMergeTool bc

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

bc3back to summary
public static final CommandLineMergeTool bc3

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

codecompareback to summary
public static final CommandLineMergeTool codecompare

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

deltawalkerback to summary
public static final CommandLineMergeTool deltawalker

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

Hint: $(pwd) command must be defined

diffmergeback to summary
public static final CommandLineMergeTool diffmerge

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

diffuseback to summary
public static final CommandLineMergeTool diffuse

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

Hint: check the ' | cat' for the call

ecmergeback to summary
public static final CommandLineMergeTool ecmerge

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

emergeback to summary
public static final CommandLineMergeTool emerge

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

Hint: $(basename) command must be defined

examdiffback to summary
public static final CommandLineMergeTool examdiff

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

exitCodeTrustableback to summary
private final boolean exitCodeTrustable
guiffyback to summary
public static final CommandLineMergeTool guiffy

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

gvimdiffback to summary
public static final CommandLineMergeTool gvimdiff

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

gvimdiff2back to summary
public static final CommandLineMergeTool gvimdiff2

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

gvimdiff3back to summary
public static final CommandLineMergeTool gvimdiff3

See:

kdiff3back to summary
public static final CommandLineMergeTool kdiff3

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

meldback to summary
public static final CommandLineMergeTool meld

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

Hint: use meld with output option only (new versions)

opendiffback to summary
public static final CommandLineMergeTool opendiff

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

Hint: check the ' | cat' for the call

p4mergeback to summary
public static final CommandLineMergeTool p4merge

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

Hint: check how to fix "no base present" / create_virtual_base problem

parametersWithBaseback to summary
private final String parametersWithBase
parametersWithoutBaseback to summary
private final String parametersWithoutBase
pathback to summary
private final String path
tkdiffback to summary
public static final CommandLineMergeTool tkdiff

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

tortoisegitmergeback to summary
public static final CommandLineMergeTool tortoisegitmerge

See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basics

Hint: merge without base is not supported

Hint: cannot diff

tortoisemergeback to summary
public static final CommandLineMergeTool tortoisemerge

See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basics

Hint: merge without base is not supported

Hint: cannot diff

vimdiffback to summary
public static final CommandLineMergeTool vimdiff

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

vimdiff2back to summary
public static final CommandLineMergeTool vimdiff2

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

vimdiff3back to summary
public static final CommandLineMergeTool vimdiff3

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

winmergeback to summary
public static final CommandLineMergeTool 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 CommandLineMergeTool xxdiff

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

Constructor Detail

CommandLineMergeToolback to summary
private CommandLineMergeTool(String path, String parametersWithBase, String parametersWithoutBase, boolean exitCodeTrustable)
CommandLineMergeToolback to summary
private CommandLineMergeTool(String path, CommandLineMergeTool from)

Method Detail

canMergeWithoutBasePresentback to summary
public boolean canMergeWithoutBasePresent()

Whether command with with base present is valid

Returns:boolean

true if command with base present is valid, false otherwise

getParametersback to summary
public String getParameters(boolean withBase)

Get parameters

Parameters
withBase:boolean

return parameters with base present?

Returns:String

parameters with or without base present

getPathback to summary
public String getPath()

Get path

Returns:String

path

isExitCodeTrustableback to summary
public boolean isExitCodeTrustable()

Whether exit code can be trusted

Returns:boolean

parameters

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