SILENT KILLERPanel

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 ]

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/tortoisemerge

can_diff () {
	return 1
}

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

merge_cmd () {
	if $base_present
	then
		basename="$(basename "$merge_tool_path" .exe)"
		if test "$basename" = "tortoisegitmerge"
		then
			"$merge_tool_path" \
				-base "$BASE" -mine "$LOCAL" \
				-theirs "$REMOTE" -merged "$MERGED"
		else
			"$merge_tool_path" \
				-base:"$BASE" -mine:"$LOCAL" \
				-theirs:"$REMOTE" -merged:"$MERGED"
		fi
	else
		echo "$merge_tool_path cannot be used without a base" 1>&2
		return 1
	fi
}

translate_merge_tool_path() {
	if type tortoisegitmerge >/dev/null 2>/dev/null
	then
		echo tortoisegitmerge
	else
		echo tortoisemerge
	fi
}

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

SILENT KILLER Tool