PHP 8.1.33
Preview: emerge Size: 535 B
//usr/libexec/git-core/mergetools/emerge

diff_cmd () {
	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
}

diff_cmd_help () {
	echo "Use Emacs' Emerge"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" \
			-f emerge-files-with-ancestor-command \
			"$LOCAL" "$REMOTE" "$BASE" \
			"$(basename "$MERGED")"
	else
		"$merge_tool_path" \
			-f emerge-files-command \
			"$LOCAL" "$REMOTE" \
			"$(basename "$MERGED")"
	fi
}

merge_cmd_help () {
	echo "Use Emacs' Emerge"
}

translate_merge_tool_path() {
	echo emacs
}

exit_code_trustable () {
	true
}

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).