Skip to main content

Browse the archive

Revision fd3aeeab0d41474af86e41d207196abbb7bf78f6 authored by Brian Bourn on 19 March 2014, 15:58:22 UTC, committed by Junio C Hamano on 19 March 2014, 18:49:39 UTC 
diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
 
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Brian Bourn <ba.bourn@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9daf0ef
Raw File
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