Staging
v0.8.1
https://github.com/git/git
Raw File
Tip revision: f3da2b79be9565779e4f76dc5812c68e156afdf0 authored by Junio C Hamano on 13 July 2017, 23:22:29 UTC
Git 2.14-rc0
Tip revision: f3da2b7
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