https://github.com/git/git
Raw File
Tip revision: 49c3e926349e964b311b46251bb2b97d3d669855 authored by Junio C Hamano on 29 October 2014, 17:48:38 UTC
Git 2.1.3
Tip revision: 49c3e92
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