PHP 8.1.33
Preview: kdiff3 Size: 818 B
//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
}

Directory Contents

Dirs: 0 × Files: 22

Name Size Perms Modified Actions
515 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
584 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
510 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
818 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
460 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
395 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
453 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
535 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
493 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
432 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
29 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
818 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
264 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
2.16 KB lrw-r--r-- 2025-06-13 22:14:31
Edit Download
29 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
418 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
423 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
403 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
761 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
17.09 KB lrw-r--r-- 2025-06-13 22:14:31
Edit Download
510 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
913 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download

If ZipArchive is unavailable, a .tar will be created (no compression).