https://github.com/git/git
Raw File
Tip revision: 0df0541bf13723658d31b8d1376b505b710e63c6 authored by Junio C Hamano on 25 June 2015, 18:03:05 UTC
Git 2.4.5
Tip revision: 0df0541
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