HEX
Server: LiteSpeed
System: Linux server456.bertina.biz 3.10.0-962.3.2.lve1.5.87.el7.x86_64 #1 SMP Tue Jan 28 09:38:56 UTC 2025 x86_64
User: danahold (1044)
PHP: 7.4.33
Disabled: mail, show_source, system, shell_exec, passthru, exec, popen, proc_open
Upload Files
File: //usr/libexec/git-core/mergetools/emerge
diff_cmd () {
	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
}

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
	status=$?
}

translate_merge_tool_path() {
	echo emacs
}