https://github.com/git/git
Raw File
Tip revision: 4d4165b80d6b91a255e2847583bd4df98b5d54e1 authored by Junio C Hamano on 30 July 2017, 21:53:25 UTC
Git 2.9.5
Tip revision: 4d4165b
codecompare
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
			-RF="$MERGED"
	else
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
			-RF="$MERGED"
	fi
	check_unchanged
}

translate_merge_tool_path() {
	if merge_mode
	then
		echo CodeMerge
	else
		echo CodeCompare
	fi
}
back to top