Skip to main content

Browse the archive

Revision 53f9a3e157dbbc901a02ac2c73346d375e24978c authored by Junio C Hamano on 21 June 2018, 17:00:06 UTC, committed by Junio C Hamano on 21 June 2018, 17:00:06 UTC 
Git 2.18
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 1fb9df7
Raw File
codecompare 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	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
}

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