vimdiff 890 Bytes
Newer Older
1
diff_cmd () {
2 3
	"$merge_tool_path" -R -f -d \
		-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
4 5 6 7 8 9 10
}

merge_cmd () {
	case "$1" in
	gvimdiff|vimdiff)
		if $base_present
		then
11 12
			"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
				"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
13 14 15 16 17 18 19 20 21
		else
			"$merge_tool_path" -f -d -c 'wincmd l' \
				"$LOCAL" "$MERGED" "$REMOTE"
		fi
		;;
	gvimdiff2|vimdiff2)
		"$merge_tool_path" -f -d -c 'wincmd l' \
			"$LOCAL" "$MERGED" "$REMOTE"
		;;
22 23 24 25 26 27 28 29 30 31
	gvimdiff3|vimdiff3)
		if $base_present
		then
			"$merge_tool_path" -f -d -c 'hid | hid | hid' \
				"$LOCAL" "$REMOTE" "$BASE" "$MERGED"
		else
			"$merge_tool_path" -f -d -c 'hid | hid' \
				"$LOCAL" "$REMOTE" "$MERGED"
		fi
		;;
32 33 34 35 36
	esac
}

translate_merge_tool_path() {
	case "$1" in
37
	gvimdiff|gvimdiff2|gvimdiff3)
38 39
		echo gvim
		;;
40
	vimdiff|vimdiff2|vimdiff3)
41 42 43 44
		echo vim
		;;
	esac
}
45 46 47 48

exit_code_trustable () {
	true
}