PST4R8 SHELL


	: 3.22.41.80
	: 170.10.163.183 / aifatradebd.com
	: Linux altar53.supremepanel53.com 4.18.0-553.8.1.lve.el8.x86_64 #1 SMP Thu Jul 4 16:24:39 UTC 2024 x86_64

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

files >> //usr/libexec/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
}