https://github.com/git/git
Raw File
Tip revision: 5d417842efeafb6e109db7574196901c4e95d273 authored by Junio C Hamano on 31 December 2012, 22:24:22 UTC
Git 1.8.1
Tip revision: 5d41784
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