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
kdiff3 
diff_cmd () {
	"$merge_tool_path" \
		--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
		"$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Base)" \
			--L2 "$MERGED (Local)" \
			--L3 "$MERGED (Remote)" \
			-o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	else
		"$merge_tool_path" --auto \
			--L1 "$MERGED (Local)" \
			--L2 "$MERGED (Remote)" \
			-o "$MERGED" "$LOCAL" "$REMOTE" \
		>/dev/null 2>&1
	fi
}

exit_code_trustable () {
	true
}
back to top