Skip to main content

Browse the archive

Revision 380ba9907737fea75c9e6bbce9df04c556fbf882 authored by Junio C Hamano on 22 October 2020, 22:01:21 UTC, committed by Junio C Hamano on 22 October 2020, 22:01:22 UTC 
Merge branch 'js/no-builtins-on-disk-option' into maint
 
Brown-paper-bag fix.

* js/no-builtins-on-disk-option:
  SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
2 parent s 69986e1 + 907e637
Raw File
guiffy 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -s "$LOCAL" \
		"$REMOTE" "$BASE" "$MERGED"
	else
		"$merge_tool_path" -m "$LOCAL" \
		"$REMOTE" "$MERGED"
	fi
}

exit_code_trustable () {
	true
}
back to top