SILENT KILLERPanel

Current Path: > > usr > libexec > git-core > > mergetools


Operation   : Linux host59.registrar-servers.com 4.18.0-513.18.1.lve.2.el8.x86_64 #1 SMP Sat Mar 30 15:36:11 UTC 2024 x86_64
Software     : Apache
Server IP    : 198.54.126.42 | Your IP: 216.73.216.135
Domains      : 1034 Domain(s)
Permission   : [ 0755 ]

Files and Folders in: //usr/libexec/git-core//mergetools

NameTypeSizeLast ModifiedActions
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.

Reading File: //usr/libexec/git-core//mergetools/kdiff3

diff_cmd () {
	"$merge_tool_path" \
		--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
		"$LOCAL" "$REMOTE" >/dev/null 2>&1
}

diff_cmd_help () {
	echo "Use KDiff3 (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Base)" \
			--L2 "$MERGED (Local)" \
			--L3 "$MERGED (Remote)" \
			-o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	else
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Local)" \
			--L2 "$MERGED (Remote)" \
			-o "$MERGED" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	fi
}

merge_cmd_help () {
	echo "Use KDiff3 (requires a graphical session)"
}

exit_code_trustable () {
	true
}

translate_merge_tool_path() {
	if type kdiff3 >/dev/null 2>/dev/null
	then
		echo kdiff3
	else
		mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
	fi
}

SILENT KILLER Tool