Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: a42a58d7b62cc1d6301440e81a83feed9d7c118c authored by Junio C Hamano on 22 May 2018, 05:18:51 UTC
Git 2.16.4
Tip revision: a42a58d
araxis
diff_cmd () {
	"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -wait -merge -3 -a1 \
			"$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	else
		"$merge_tool_path" -wait -2 \
			"$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
	fi
}

translate_merge_tool_path() {
	echo compare
}
back to top