Current Path: > > > > usr > libexec > git-core > mergetools
Operation : Linux premium131.web-hosting.com 4.18.0-553.44.1.lve.el8.x86_64 #1 SMP Thu Mar 13 14:29:12 UTC 2025 x86_64 Software : Apache Server IP : 162.0.232.56 | Your IP: 216.73.216.111 Domains : 1034 Domain(s) Permission : [ 0755 ]
Name | Type | Size | Last Modified | Actions |
---|---|---|---|---|
araxis | File | 515 bytes | June 13 2025 22:14:31. | |
bc | File | 584 bytes | June 13 2025 22:14:31. | |
codecompare | File | 510 bytes | June 13 2025 22:14:31. | |
deltawalker | File | 818 bytes | June 13 2025 22:14:31. | |
diffmerge | File | 460 bytes | June 13 2025 22:14:31. | |
diffuse | File | 395 bytes | June 13 2025 22:14:31. | |
ecmerge | File | 453 bytes | June 13 2025 22:14:31. | |
emerge | File | 535 bytes | June 13 2025 22:14:31. | |
examdiff | File | 493 bytes | June 13 2025 22:14:31. | |
guiffy | File | 432 bytes | June 13 2025 22:14:31. | |
gvimdiff | File | 29 bytes | June 13 2025 22:14:31. | |
kdiff3 | File | 818 bytes | June 13 2025 22:14:31. | |
kompare | File | 264 bytes | June 13 2025 22:14:31. | |
meld | File | 2213 bytes | June 13 2025 22:14:31. | |
nvimdiff | File | 29 bytes | June 13 2025 22:14:31. | |
opendiff | File | 418 bytes | June 13 2025 22:14:31. | |
smerge | File | 423 bytes | June 13 2025 22:14:31. | |
tkdiff | File | 403 bytes | June 13 2025 22:14:31. | |
tortoisemerge | File | 761 bytes | June 13 2025 22:14:31. | |
vimdiff | File | 17505 bytes | June 13 2025 22:14:31. | |
winmerge | File | 510 bytes | June 13 2025 22:14:31. | |
xxdiff | File | 913 bytes | June 13 2025 22:14:31. |
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 <file>' 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 }
SILENT KILLER Tool