Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: 76b54ee9b9944ee70422ac24884f78769cf264f1 authored by Jonathan Nieder on 19 April 2020, 23:26:41 UTC
Git 2.19.5
Tip revision: 76b54ee
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
}

exit_code_trustable () {
	true
}
back to top