BLUE

Upload

Tip: You can also drag & drop files anywhere on this page to upload.

Edit File Size: 1.19 KB

//lib/git-core/mergetools/vimdiff

Text Base64

diff_cmd () {
	"$merge_tool_path" -R -f -d \
		-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
}

merge_cmd () {
	case "$1" in
	*vimdiff)
		if $base_present
		then
			"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
				"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
		else
			"$merge_tool_path" -f -d -c 'wincmd l' \
				"$LOCAL" "$MERGED" "$REMOTE"
		fi
		;;
	*vimdiff1)
		"$merge_tool_path" -f -d \
			-c 'echon "Resolve conflicts leftward then save. Use :cq to abort."' \
			"$LOCAL" "$REMOTE"
		ret="$?"
		if test "$ret" -eq 0
		then
			cp -- "$LOCAL" "$MERGED"
		fi
		return "$ret"
		;;
	*vimdiff2)
		"$merge_tool_path" -f -d -c 'wincmd l' \
			"$LOCAL" "$MERGED" "$REMOTE"
		;;
	*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
		;;
	esac
}

translate_merge_tool_path() {
	case "$1" in
	nvimdiff*)
		echo nvim
		;;
	gvimdiff*)
		echo gvim
		;;
	vimdiff*)
		echo vim
		;;
	esac
}

exit_code_trustable () {
	true
}

list_tool_variants () {
	for prefix in '' g n; do
		for suffix in '' 1 2 3; do
			echo "${prefix}vimdiff${suffix}"
		done
	done
}

Exit & Reset Text mode: syntax highlighting auto-detects file type.

Name	Size	Perms	Modified	Actions
araxis	358 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
bc	423 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
codecompare	353 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
deltawalker	663 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
diffmerge	309 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
diffuse	248 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
ecmerge	306 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
emerge	438 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
examdiff	336 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
guiffy	263 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
gvimdiff	29 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
kdiff3	673 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
kompare	117 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
meld	1.94 KB	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
nvimdiff	29 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
opendiff	267 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
p4merge	617 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
smerge	264 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
tkdiff	258 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
tortoisemerge	602 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
vimdiff	1.19 KB	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
winmerge	361 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive
xxdiff	768 B	lrw-r--r--	2026-02-26 19:49:53	Edit Download recursive recursive

Directory Contents