Module org.eclipse.jgit
Enum Class CommandLineMergeTool
- All Implemented Interfaces:
Serializable
,Comparable<CommandLineMergeTool>
,java.lang.constant.Constable
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
-
Nested Class Summary
Nested classes/interfaces inherited from class java.lang.Enum
Enum.EnumDesc<E extends Enum<E>>
-
Enum Constant Summary
Enum ConstantsEnum ConstantDescription -
Method Summary
Modifier and TypeMethodDescriptionboolean
Whether command with with base present is validgetParameters
(boolean withBase) Get parametersgetPath()
Get pathboolean
Whether exit code can be trustedstatic CommandLineMergeTool
Returns the enum constant of this class with the specified name.static CommandLineMergeTool[]
values()
Returns an array containing the constants of this enum class, in the order they are declared.
-
Enum Constant Details
-
araxis
-
bc
-
bc3
-
codecompare
-
deltawalker
See: https://www.deltawalker.com/integrate/command-lineHint: $(pwd) command must be defined
-
diffmerge
-
diffuse
See: http://diffuse.sourceforge.net/manual.html#introduction-usageHint: check the ' | cat' for the call
-
ecmerge
-
emerge
See: https://www.gnu.org/software/emacs/manual/html_node/emacs/Overview-of-Emerge.htmlHint: $(basename) command must be defined
-
examdiff
-
guiffy
-
gvimdiff
-
gvimdiff2
-
gvimdiff3
-
kdiff3
-
meld
See: http://meldmerge.org/help/file-mode.htmlHint: use meld with output option only (new versions)
-
opendiff
See: http://www.manpagez.com/man/1/opendiff/Hint: check the ' | cat' for the call
-
p4merge
See: https://www.perforce.com/manuals/v15.1/cmdref/p4_merge.htmlHint: check how to fix "no base present" / create_virtual_base problem
-
tkdiff
-
tortoisegitmerge
See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basicsHint: merge without base is not supported
Hint: cannot diff
-
tortoisemerge
See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basicsHint: merge without base is not supported
Hint: cannot diff
-
vimdiff
-
vimdiff2
-
vimdiff3
-
winmerge
See: http://manual.winmerge.org/Command_line.htmlHint: check how 'mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"' works
-
xxdiff
-
-
Method Details
-
values
Returns an array containing the constants of this enum class, in the order they are declared.- Returns:
- an array containing the constants of this enum class, in the order they are declared
-
valueOf
Returns the enum constant of this class with the specified name. The string must match exactly an identifier used to declare an enum constant in this class. (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 class has no constant with the specified nameNullPointerException
- if the argument is null
-
getPath
Get path- Returns:
- path
-
getParameters
Get parameters- Parameters:
withBase
- return parameters with base present?- Returns:
- parameters with or without base present
-
isExitCodeTrustable
public boolean isExitCodeTrustable()Whether exit code can be trusted- Returns:
- parameters
-
canMergeWithoutBasePresent
public boolean canMergeWithoutBasePresent()Whether command with with base present is valid- Returns:
- true if command with base present is valid, false otherwise
-