Skip to main content

Browse the archive

Revision c3ebe91b40c23a1b70dba36383a23016711d8bc0 authored by Junio C Hamano on 31 May 2024, 00:25:37 UTC, committed by Junio C Hamano on 31 May 2024, 00:25:37 UTC 
Sync with Git 2.45.2
2 parent s 58bac47 + bea9ecd
Raw File
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
}
back to top