Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 0bfff8146f8c055fd95af4567286929ba8216fa7 authored by Junio C Hamano on 30 July 2017, 22:00:04 UTC
Git 2.10.4
Tip revision: 0bfff81
diffmerge
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --merge --result="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" --merge \
			--result="$MERGED" "$LOCAL" "$REMOTE"
	fi
}
back to top