PHP 8.1.33
Preview: xxdiff Size: 913 B
//usr/libexec/git-core/mergetools/xxdiff

diff_cmd () {
	"$merge_tool_path" \
		-R 'Accel.Search: "Ctrl+F"' \
		-R 'Accel.SearchForward: "Ctrl+G"' \
		"$LOCAL" "$REMOTE"

	# xxdiff can segfault on binary files which are often uninteresting.
	# Do not allow segfaults to stop us from continuing on to the next file.
	if test $? = 128
	then
		return 1
	fi
}

diff_cmd_help () {
	echo "Use xxdiff (requires a graphical session)"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -X --show-merged-pane \
			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
			-R 'Accel.Search: "Ctrl+F"' \
			-R 'Accel.SearchForward: "Ctrl+G"' \
			--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" -X $extra \
			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
			-R 'Accel.Search: "Ctrl+F"' \
			-R 'Accel.SearchForward: "Ctrl+G"' \
			--merged-file "$MERGED" "$LOCAL" "$REMOTE"
	fi
}

merge_cmd_help () {
	echo "Use xxdiff (requires a graphical session)"
}

Directory Contents

Dirs: 0 × Files: 22

Name Size Perms Modified Actions
515 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
584 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
510 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
818 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
460 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
395 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
453 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
535 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
493 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
432 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
29 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
818 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
264 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
2.16 KB lrw-r--r-- 2025-06-13 22:14:31
Edit Download
29 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
418 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
423 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
403 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
761 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
17.09 KB lrw-r--r-- 2025-06-13 22:14:31
Edit Download
510 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download
913 B lrw-r--r-- 2025-06-13 22:14:31
Edit Download

If ZipArchive is unavailable, a .tar will be created (no compression).