https://github.com/git/git
Raw File
Tip revision: 9b7cbb315923e61bb0c4297c701089f30e116750 authored by Junio C Hamano on 17 December 2014, 19:49:34 UTC
Git 2.2.1
Tip revision: 9b7cbb3
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
	status=$?
}

translate_merge_tool_path() {
	echo emacs
}
back to top