Heray-Was-Here
Server : Apache
System : Linux infong-uk56 4.4.400-icpu-108 #2 SMP Wed Feb 11 11:51:01 UTC 2026 x86_64
User : u78863098 ( 10368940)
PHP Version : 8.4.24
Disable Function : NONE
Directory :  /lib/git-core/mergetools/

Upload File :
current_dir [ Writeable ] document_root [ Writeable ]

 

Current File : //lib/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
}

Hry