https://github.com/git/git
Raw File
Tip revision: 27ea6f85beff1173ec74349fa35c45951feee570 authored by Junio C Hamano on 04 September 2015, 17:46:00 UTC
Git 2.5.2
Tip revision: 27ea6f8
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