---

araxis

diff_cmd () { "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1 } diff_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } merge_cmd () { if $base_present then "$merge_tool_path" -wait -merge -3 -a1 \ "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 else "$merge_tool_path" -wait -2 \ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 fi } merge_cmd_help () { echo "Use Araxis Merge (requires a graphical session)" } translate_merge_tool_path() { echo compare }

---

docroot: /home/induvedam/public_html

---

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

	.		4096
	..		8192
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	smerge		423
X	tkdiff		403
X	tortoisemerge		761
X	vimdiff		18438
X	vscode		373
X	winmerge		510
X	xxdiff		913