HEX
Server: nginx/1.16.1
System: Linux ecs-04358622 4.19.90-2107.6.0.0100.oe1.bclinux.x86_64 #1 SMP Wed Dec 1 19:59:44 CST 2021 x86_64
User: nginx (994)
PHP: 8.0.0
Disabled: NONE
Upload Files
File: //usr/libexec/git-core/mergetools/ecmerge
diff_cmd () {
	"$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
			--default --mode=merge3 --to="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			--default --mode=merge2 --to="$MERGED"
	fi
}