Default page

Your IP: 216.73.216.96
Server IP: 147.93.97.220
Server: Linux srv843233 6.8.0-71-generic #71-Ubuntu SMP PREEMPT_DYNAMIC Tue Jul 22 16:52:38 UTC 2025 x86_64
Server Software: nginx/1.28.0
PHP Version: 8.2.29
Buat File | Buat Folder

Dir : ~/proc/thread-self/root/lib/git-core/mergetools/

View File Name : tkdiff

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

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

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	fi
}

exit_code_trustable () {
	true
}

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