vimdiff 878 字节
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 11 12 13 14 15 16 17 18 19 20 21 22
}

merge_cmd () {
	touch "$BACKUP"
	case "$1" in
	gvimdiff|vimdiff)
		if $base_present
		then
			"$merge_tool_path" -f -d -c 'wincmd J' \
				"$MERGED" "$LOCAL" "$BASE" "$REMOTE"
		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"
		;;
F
Felipe Contreras 已提交
23 24 25 26 27 28 29 30 31 32
	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
		;;
33 34 35 36 37 38
	esac
	check_unchanged
}

translate_merge_tool_path() {
	case "$1" in
F
Felipe Contreras 已提交
39
	gvimdiff|gvimdiff2|gvimdiff3)
40 41
		echo gvim
		;;
F
Felipe Contreras 已提交
42
	vimdiff|vimdiff2|vimdiff3)
43 44 45 46
		echo vim
		;;
	esac
}