Psyduck - 可達鴨 之 鴨力山大2


Server : LiteSpeed
System : Linux premium217.web-hosting.com 4.18.0-553.54.1.lve.el8.x86_64 #1 SMP Wed Jun 4 13:01:13 UTC 2025 x86_64
User : alloknri ( 880)
PHP Version : 8.1.34
Disable Function : NONE
Directory :  /usr/libexec/git-core/mergetools/

Upload File :
current_dir [ Writeable ] document_root [ Writeable ]

 

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)"
}
Name
Size
Permissions
Options
araxis
0.503 KB
-rw-r--r--
bc
0.57 KB
-rw-r--r--
codecompare
0.498 KB
-rw-r--r--
deltawalker
0.799 KB
-rw-r--r--
diffmerge
0.449 KB
-rw-r--r--
diffuse
0.386 KB
-rw-r--r--
ecmerge
0.442 KB
-rw-r--r--
emerge
0.522 KB
-rw-r--r--
examdiff
0.481 KB
-rw-r--r--
guiffy
0.422 KB
-rw-r--r--
gvimdiff
0.028 KB
-rw-r--r--
kdiff3
0.799 KB
-rw-r--r--
kompare
0.258 KB
-rw-r--r--
meld
2.161 KB
-rw-r--r--
nvimdiff
0.028 KB
-rw-r--r--
opendiff
0.408 KB
-rw-r--r--
smerge
0.413 KB
-rw-r--r--
tkdiff
0.394 KB
-rw-r--r--
tortoisemerge
0.743 KB
-rw-r--r--
vimdiff
17.095 KB
-rw-r--r--
winmerge
0.498 KB
-rw-r--r--
xxdiff
0.892 KB
-rw-r--r--