BLACKSITE


	: 216.73.217.122
	: 31.97.239.53 / learnageacademy.com
	: Linux srv1143180 6.8.0-106-generic #106-Ubuntu SMP PREEMPT_DYNAMIC Fri Mar 6 07:58:08 UTC 2026 x86_64

: /lib/git-core/mergetools/

files >> //lib/git-core/mergetools/guiffy

 diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

diff_cmd_help () {
	echo "Use Guiffy's Diff Tool (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -s "$LOCAL" \
		"$REMOTE" "$BASE" "$MERGED"
	else
		"$merge_tool_path" -m "$LOCAL" \
		"$REMOTE" "$MERGED"
	fi
}

merge_cmd_help () {
	echo "Use Guiffy's Diff Tool (requires a graphical session)"
}

exit_code_trustable () {
	true
}