Team Ai
Datasetpublic

codekingpro/portable-devtools

sourceHugging Faceupdated 5mo agoView on Hugging Face
1likes14kdownloads
emerge35 linesDownload Raw Back to mergetools
1diff_cmd () {2	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"3}4 5diff_cmd_help () {6	echo "Use Emacs' Emerge"7}8 9merge_cmd () {10	if $base_present11	then12		"$merge_tool_path" \13			-f emerge-files-with-ancestor-command \14			"$LOCAL" "$REMOTE" "$BASE" \15			"$(basename "$MERGED")"16	else17		"$merge_tool_path" \18			-f emerge-files-command \19			"$LOCAL" "$REMOTE" \20			"$(basename "$MERGED")"21	fi22}23 24merge_cmd_help () {25	echo "Use Emacs' Emerge"26}27 28translate_merge_tool_path() {29	echo emacs30}31 32exit_code_trustable () {33	true34}35 
codekingpro/portable-devtools · Team Ai