Gecko [ theprintave.ca ]

Linux webserver 6.8.0-49-generic #49~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Wed Nov 6 17:42:15 UTC 2 x86_64
Apache/2.4.52 (Ubuntu)
Server IP : 192.168.1.1 & Your IP : 18.217.207.109
Domains : Cant Read [ /etc/named.conf ]
User : www-data

Name	Size	Permission	Date
araxis	358 B	-rw-r--r--	2025-01-13 20:13
bc	423 B	-rw-r--r--	2025-01-13 20:13
codecompare	353 B	-rw-r--r--	2025-01-13 20:13
deltawalker	663 B	-rw-r--r--	2025-01-13 20:13
diffmerge	309 B	-rw-r--r--	2025-01-13 20:13
diffuse	248 B	-rw-r--r--	2025-01-13 20:13
ecmerge	306 B	-rw-r--r--	2025-01-13 20:13
emerge	438 B	-rw-r--r--	2025-01-13 20:13
examdiff	336 B	-rw-r--r--	2025-01-13 20:13
guiffy	263 B	-rw-r--r--	2025-01-13 20:13
gvimdiff	29 B	-rw-r--r--	2025-01-13 20:13
kdiff3	673 B	-rw-r--r--	2025-01-13 20:13
kompare	117 B	-rw-r--r--	2025-01-13 20:13
meld	1.94 KB	-rw-r--r--	2025-01-13 20:13
nvimdiff	29 B	-rw-r--r--	2025-01-13 20:13
opendiff	267 B	-rw-r--r--	2025-01-13 20:13
p4merge	617 B	-rw-r--r--	2025-01-13 20:13
smerge	264 B	-rw-r--r--	2025-01-13 20:13
tkdiff	258 B	-rw-r--r--	2025-01-13 20:13
tortoisemerge	602 B	-rw-r--r--	2025-01-13 20:13
vimdiff	1.19 KB	-rw-r--r--	2025-01-13 20:13
winmerge	361 B	-rw-r--r--	2025-01-13 20:13
xxdiff	768 B	-rw-r--r--	2025-01-13 20:13

Rename

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
}