MOON
Server: Apache
System: Linux 54-179-220-51.cprapid.com 3.10.0-1160.144.1.el7.tuxcare.els4.x86_64 #1 SMP Tue Apr 7 08:40:40 UTC 2026 x86_64
User: thehunarfound (1001)
PHP: 7.4.29
Disabled: NONE
Upload Files
File: //usr/libexec/git-core/mergetools/opendiff
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
	check_unchanged
}