D52810.diff
No OneTemporary
Actions

Size

847 B

Referenced Files

None

Subscribers

None

D52810.diff
View Options

	diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
	--- a/gnu/usr.bin/diff3/Makefile
	+++ b/gnu/usr.bin/diff3/Makefile
	@@ -1,8 +1,9 @@
	+PACKAGE= diff3
	+
	DIFFSRC=${SRCTOP}/contrib/diff/src
	.PATH: ${DIFFSRC} \
	${SRCTOP}/contrib/diff/lib \
	${SRCTOP}/contrib/diff/man
	-
	PROG= diff3
	SRCS= diff3.c version-etc.c \
	xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c
	diff --git a/release/packages/ucl/diff3-all.ucl b/release/packages/ucl/diff3-all.ucl
	new file mode 100644
	--- /dev/null
	+++ b/release/packages/ucl/diff3-all.ucl
	@@ -0,0 +1,15 @@
	+/*
	+ * SPDX-License-Identifier: ISC
	+ */
	+
	+comment = "GNU 3-way file comparison and merge utility"
	+
	+desc = <<EOD
	+Compares three files line by line, optionally merging them.
	+EOD
	+
	+licenses = [ "GPL-2.0-or-later" ]
	+
	+annotations {
	+ set = "optional,optional-jail"
	+}