https://github.com/git/git
Raw File
Tip revision: 4384e3cde2ce8ecd194202e171ae16333d241326 authored by Junio C Hamano on 04 August 2017, 16:31:12 UTC
Git 2.14
Tip revision: 4384e3c
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