$32 GRAYBYTE WORDPRESS FILE MANAGER $80

SERVER : in-mum-web1330.main-hosting.eu #1 SMP Mon Feb 10 22:45:17 UTC 2025
SERVER IP : 88.222.243.0 | 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//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)"
}

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