Enum CommandLineMergeTool
- java.lang.Object
-
- java.lang.Enum<CommandLineMergeTool>
-
- org.eclipse.jgit.internal.diffmergetool.CommandLineMergeTool
-
- All Implemented Interfaces:
Serializable
,Comparable<CommandLineMergeTool>
public enum CommandLineMergeTool extends Enum<CommandLineMergeTool>
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 toolsaraxis 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
-
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description boolean
canMergeWithoutBasePresent()
String
getParameters(boolean withBase)
String
getPath()
boolean
isExitCodeTrustable()
static CommandLineMergeTool
valueOf(String name)
Returns the enum constant of this type with the specified name.static CommandLineMergeTool[]
values()
Returns an array containing the constants of this enum type, in the order they are declared.
-
-
-
Enum Constant Detail
-
araxis
public static final CommandLineMergeTool araxis
-
bc
public static final CommandLineMergeTool bc
-
bc3
public static final CommandLineMergeTool bc3
-
codecompare
public static final CommandLineMergeTool codecompare
-
deltawalker
public static final CommandLineMergeTool deltawalker
See: https://www.deltawalker.com/integrate/command-lineHint: $(pwd) command must be defined
-
diffmerge
public static final CommandLineMergeTool diffmerge
-
diffuse
public static final CommandLineMergeTool diffuse
See: http://diffuse.sourceforge.net/manual.html#introduction-usageHint: check the ' | cat' for the call
-
ecmerge
public static final CommandLineMergeTool ecmerge
-
emerge
public static final CommandLineMergeTool emerge
See: https://www.gnu.org/software/emacs/manual/html_node/emacs/Overview-of-Emerge.htmlHint: $(basename) command must be defined
-
examdiff
public static final CommandLineMergeTool examdiff
-
guiffy
public static final CommandLineMergeTool guiffy
-
gvimdiff
public static final CommandLineMergeTool gvimdiff
-
gvimdiff2
public static final CommandLineMergeTool gvimdiff2
-
gvimdiff3
public static final CommandLineMergeTool gvimdiff3
-
kdiff3
public static final CommandLineMergeTool kdiff3
-
meld
public static final CommandLineMergeTool meld
See: http://meldmerge.org/help/file-mode.htmlHint: use meld with output option only (new versions)
-
opendiff
public static final CommandLineMergeTool opendiff
See: http://www.manpagez.com/man/1/opendiff/Hint: check the ' | cat' for the call
-
p4merge
public static final CommandLineMergeTool 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
public static final CommandLineMergeTool tkdiff
-
tortoisegitmerge
public static final CommandLineMergeTool tortoisegitmerge
See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basicsHint: merge without base is not supported
Hint: cannot diff
-
tortoisemerge
public static final CommandLineMergeTool tortoisemerge
See: https://tortoisegit.org/docs/tortoisegitmerge/tme-automation.html#tme-automation-basicsHint: merge without base is not supported
Hint: cannot diff
-
vimdiff
public static final CommandLineMergeTool vimdiff
-
vimdiff2
public static final CommandLineMergeTool vimdiff2
-
vimdiff3
public static final CommandLineMergeTool vimdiff3
-
winmerge
public static final CommandLineMergeTool winmerge
See: http://manual.winmerge.org/Command_line.htmlHint: check how 'mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"' works
-
xxdiff
public static final CommandLineMergeTool xxdiff
-
-
Method Detail
-
values
public static CommandLineMergeTool[] 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 (CommandLineMergeTool c : CommandLineMergeTool.values()) System.out.println(c);
- Returns:
- an array containing the constants of this enum type, in the order they are declared
-
valueOf
public static CommandLineMergeTool 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 nameNullPointerException
- if the argument is null
-
getPath
public String getPath()
- Returns:
- path
-
getParameters
public String getParameters(boolean withBase)
- Parameters:
withBase
- return parameters with base present?- Returns:
- parameters with or without base present
-
isExitCodeTrustable
public boolean isExitCodeTrustable()
- Returns:
- parameters
-
canMergeWithoutBasePresent
public boolean canMergeWithoutBasePresent()
- Returns:
- true if command with base present is valid, false otherwise
-
-