codekingpro/portable-devtools

1diff_cmd () {2	"$merge_tool_path" "$LOCAL" "$REMOTE"3}4 5diff_cmd_help () {6	echo "Use Beyond Compare (requires a graphical session)"7}8 9merge_cmd () {10	if $base_present11	then12		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \13			-mergeoutput="$MERGED"14	else15		"$merge_tool_path" "$LOCAL" "$REMOTE" \16			-mergeoutput="$MERGED"17	fi18}19 20merge_cmd_help () {21	echo "Use Beyond Compare (requires a graphical session)"22}23 24translate_merge_tool_path() {25	if type bcomp >/dev/null 2>/dev/null26	then27		echo bcomp28	else29		echo bcompare30	fi31}32 33list_tool_variants () {34	echo bc35	echo bc336	echo bc437}38