https://github.com/git/git
Raw File
Tip revision: fdf96a20acf96a6ac538df8113b2aafd6ed71d50 authored by Junio C Hamano on 12 January 2015, 22:06:12 UTC
Git 2.2.2
Tip revision: fdf96a2
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