//usr/libexec/git-core/mergetools
23 items
NAME ↑ SIZE MODIFIED PERMS ACTIONS
.. / Parent Directory
araxis — 515 B
2025-06-13 22:20 · rw-r--r--
515 B 2025-06-13 22:20 rw-r--r--
bc — 584 B
2025-06-13 22:20 · rw-r--r--
584 B 2025-06-13 22:20 rw-r--r--
codecompare — 510 B
2025-06-13 22:20 · rw-r--r--
510 B 2025-06-13 22:20 rw-r--r--
deltawalker — 818 B
2025-06-13 22:20 · rw-r--r--
818 B 2025-06-13 22:20 rw-r--r--
diffmerge — 460 B
2025-06-13 22:20 · rw-r--r--
460 B 2025-06-13 22:20 rw-r--r--
diffuse — 395 B
2025-06-13 22:20 · rw-r--r--
395 B 2025-06-13 22:20 rw-r--r--
ecmerge — 453 B
2025-06-13 22:20 · rw-r--r--
453 B 2025-06-13 22:20 rw-r--r--
emerge — 535 B
2025-06-13 22:20 · rw-r--r--
535 B 2025-06-13 22:20 rw-r--r--
examdiff — 493 B
2025-06-13 22:20 · rw-r--r--
493 B 2025-06-13 22:20 rw-r--r--
guiffy — 432 B
2025-06-13 22:20 · rw-r--r--
432 B 2025-06-13 22:20 rw-r--r--
gvimdiff — 29 B
2025-06-13 22:20 · rw-r--r--
29 B 2025-06-13 22:20 rw-r--r--
kdiff3 — 818 B
2025-06-13 22:20 · rw-r--r--
818 B 2025-06-13 22:20 rw-r--r--
kompare — 264 B
2025-06-13 22:20 · rw-r--r--
264 B 2025-06-13 22:20 rw-r--r--
meld — 2.16 KB
2025-06-13 22:20 · rw-r--r--
2.16 KB 2025-06-13 22:20 rw-r--r--
nvimdiff — 29 B
2025-06-13 22:20 · rw-r--r--
29 B 2025-06-13 22:20 rw-r--r--
opendiff — 418 B
2025-06-13 22:20 · rw-r--r--
418 B 2025-06-13 22:20 rw-r--r--
smerge — 423 B
2025-06-13 22:20 · rw-r--r--
423 B 2025-06-13 22:20 rw-r--r--
tkdiff — 403 B
2025-06-13 22:20 · rw-r--r--
403 B 2025-06-13 22:20 rw-r--r--
tortoisemerge — 761 B
2025-06-13 22:20 · rw-r--r--
761 B 2025-06-13 22:20 rw-r--r--
vimdiff — 17.23 KB
2025-06-13 22:20 · rw-r--r--
17.23 KB 2025-06-13 22:20 rw-r--r--
vscode — 373 B
2025-06-13 22:20 · rw-r--r--
373 B 2025-06-13 22:20 rw-r--r--
winmerge — 510 B
2025-06-13 22:20 · rw-r--r--
510 B 2025-06-13 22:20 rw-r--r--
xxdiff — 913 B
2025-06-13 22:20 · rw-r--r--
913 B 2025-06-13 22:20 rw-r--r--
ONLINE
mergetools
23 items
00:27:15
TERMINAL FM
NAVIGATION
ACTIONS
SELECTION
Edit
Preview
Download
Rename
Copy
Chmod
Delete
diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use Meld (requires a graphical session)" } merge_cmd () { check_meld_for_features option_auto_merge= if test "$meld_use_auto_merge_option" = true then option_auto_merge="--auto-merge" fi if test "$meld_has_output_option" = true then "$merge_tool_path" $option_auto_merge --output="$MERGED" \ "$LOCAL" "$BASE" "$REMOTE" else "$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE" fi } merge_cmd_help () { echo "Use Meld (requires a graphical session) with optional \`auto merge\` (see \`git help mergetool\`'s \`CONFIGURATION\` section)" } # Get meld help message init_meld_help_msg () { if test -z "$meld_help_msg" then meld_path="$(git config mergetool.meld.path || echo meld)" meld_help_msg=$("$meld_path" --help 2>&1) fi } # Check the features and set flags check_meld_for_features () { # Check whether we should use 'meld --output ' if test -z "$meld_has_output_option" then meld_has_output_option=$(git config --bool mergetool.meld.hasOutput) case "$meld_has_output_option" in true | false) : use configured value ;; *) : empty or invalid configured value, detecting "--output" automatically init_meld_help_msg case "$meld_help_msg" in *"--output="* | *'[OPTION...]'*) # All version that has [OPTION...] supports --output meld_has_output_option=true ;; *) meld_has_output_option=false ;; esac ;; esac fi # Check whether we should use 'meld --auto-merge ...' if test -z "$meld_use_auto_merge_option" then meld_use_auto_merge_option=$( git config --bool-or-str mergetool.meld.useAutoMerge ) case "$meld_use_auto_merge_option" in true | false) : use well formatted boolean value ;; auto) # testing the "--auto-merge" option only if config is "auto" init_meld_help_msg case "$meld_help_msg" in *"--auto-merge"* | *'[OPTION...]'*) meld_use_auto_merge_option=true ;; *) meld_use_auto_merge_option=false ;; esac ;; "") meld_use_auto_merge_option=false ;; *) die "unknown mergetool.meld.useAutoMerge: $meld_use_auto_merge_option" ;; esac fi }