---

tkdiff

diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } diff_cmd_help () { echo "Use TkDiff (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE" else "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" fi } exit_code_trustable () { true } merge_cmd_help () { echo "Use TkDiff (requires a graphical session)" }

---

docroot: /var/www/469ed2f6-4d4b-4a8a-9f5e-ee4ef04d3bc8/public_html

---

curdir: /usr/lib/git-core/mergetools

	.		4096
	..		24576
X	araxis		515
X	bc		584
X	codecompare		510
X	deltawalker		818
X	diffmerge		460
X	diffuse		395
X	ecmerge		453
X	emerge		535
X	examdiff		493
X	guiffy		432
X	gvimdiff		29
X	kdiff3		818
X	kompare		264
X	meld		2213
X	nvimdiff		29
X	opendiff		418
X	p4merge		784
X	smerge		423
X	tkdiff		403
X	tortoisemerge		761
X	vimdiff		17505
X	winmerge		510
X	xxdiff		913