https://github.com/git/git
Raw File
Tip revision: 773e3a2e0226cffac6c813c2d3bea5ba480675d8 authored by Junio C Hamano on 05 May 2017, 04:29:43 UTC
Git 2.11.2
Tip revision: 773e3a2
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