$42 GRAYBYTE WORDPRESS FILE MANAGER $95

SERVER : in-mum-web1330.main-hosting.eu #1 SMP Mon Feb 10 22:45:17 UTC 2025
SERVER IP : 88.222.243.124 | ADMIN IP 216.73.216.143
OPTIONS : CRL = ON | WGT = ON | SDO = OFF | PKEX = OFF
DEACTIVATED : NONE

/usr/libexec/git-core/mergetools/

HOME
Current File : /usr/libexec/git-core/mergetools//meld
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
}

Current_dir [ NOT WRITEABLE ] Document_root [ WRITEABLE ]


[ Back ]
NAME
SIZE
LAST TOUCH
USER
CAN-I?
FUNCTIONS
..
--
28 Feb 2025 12.51 AM
root / root
0755
araxis
0.503 KB
31 May 2024 12.41 AM
root / root
0644
bc
0.57 KB
31 May 2024 12.41 AM
root / root
0644
codecompare
0.498 KB
31 May 2024 12.41 AM
root / root
0644
deltawalker
0.799 KB
31 May 2024 12.41 AM
root / root
0644
diffmerge
0.449 KB
31 May 2024 12.41 AM
root / root
0644
diffuse
0.386 KB
31 May 2024 12.41 AM
root / root
0644
ecmerge
0.442 KB
31 May 2024 12.41 AM
root / root
0644
emerge
0.522 KB
31 May 2024 12.41 AM
root / root
0644
examdiff
0.481 KB
31 May 2024 12.41 AM
root / root
0644
guiffy
0.422 KB
31 May 2024 12.41 AM
root / root
0644
gvimdiff
0.028 KB
31 May 2024 12.41 AM
root / root
0644
kdiff3
0.799 KB
31 May 2024 12.41 AM
root / root
0644
kompare
0.258 KB
31 May 2024 12.41 AM
root / root
0644
meld
2.161 KB
31 May 2024 12.41 AM
root / root
0644
nvimdiff
0.028 KB
31 May 2024 12.41 AM
root / root
0644
opendiff
0.408 KB
31 May 2024 12.41 AM
root / root
0644
smerge
0.413 KB
31 May 2024 12.41 AM
root / root
0644
tkdiff
0.394 KB
31 May 2024 12.41 AM
root / root
0644
tortoisemerge
0.743 KB
31 May 2024 12.41 AM
root / root
0644
vimdiff
17.095 KB
31 May 2024 12.41 AM
root / root
0644
winmerge
0.498 KB
31 May 2024 12.41 AM
root / root
0644
xxdiff
0.892 KB
31 May 2024 12.41 AM
root / root
0644

GRAYBYTE WORDPRESS FILE MANAGER @ 2026 CONTACT ME
Static GIF