Skip to main content

Browse the archive

Revision 50b2d72e110cad39ecaf2322bfdf1b60cd13dd96 authored by Junio C Hamano on 19 January 2022, 20:48:46 UTC, committed by Junio C Hamano on 19 January 2022, 20:48:46 UTC 
Git 2.35-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e2724c1
Raw File
emerge 
diff_cmd () {
	"$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" \
			-f emerge-files-with-ancestor-command \
			"$LOCAL" "$REMOTE" "$BASE" \
			"$(basename "$MERGED")"
	else
		"$merge_tool_path" \
			-f emerge-files-command \
			"$LOCAL" "$REMOTE" \
			"$(basename "$MERGED")"
	fi
}

translate_merge_tool_path() {
	echo emacs
}

exit_code_trustable () {
	true
}
back to top