FM / mergetools

/usr/lib/git-core/mergetools

Name	Size	Mode	Actions
araxis	358	0644	edit dl rm
bc	423	0644	edit dl rm
codecompare	353	0644	edit dl rm
deltawalker	663	0644	edit dl rm
diffmerge	309	0644	edit dl rm
diffuse	248	0644	edit dl rm
ecmerge	306	0644	edit dl rm
emerge	438	0644	edit dl rm
examdiff	336	0644	edit dl rm
guiffy	263	0644	edit dl rm
gvimdiff	29	0644	edit dl rm
kdiff3	673	0644	edit dl rm
kompare	117	0644	edit dl rm
meld	1986	0644	edit dl rm
nvimdiff	29	0644	edit dl rm
opendiff	267	0644	edit dl rm
p4merge	617	0644	edit dl rm
smerge	264	0644	edit dl rm
tkdiff	258	0644	edit dl rm
tortoisemerge	602	0644	edit dl rm
vimdiff	1220	0644	edit dl rm
winmerge	361	0644	edit dl rm
xxdiff	768	0644	edit dl rm

Edit: /usr/lib/git-core/mergetools/vimdiff (1220B)

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
}

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 }