From: CSRG <csrg@ucbvax.Berkeley.EDU>
Date: Mon, 1 Jul 1991 08:22:44 +0000 (-0800)
Subject: BSD 4_3_Net_2 development
X-Git-Tag: BSD-4_3_Net_2~8
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/540fe379a3cb4bb4199ac3d50f72a39d5b21246d

BSD 4_3_Net_2 development
Work on file usr/src/contrib/rcs/src/merge

Synthesized-from: CSRG/cd2/net.2
---

diff --git a/usr/src/contrib/rcs/src/merge b/usr/src/contrib/rcs/src/merge
new file mode 100755
index 0000000000..cd356bc1bc
--- /dev/null
+++ b/usr/src/contrib/rcs/src/merge
@@ -0,0 +1,52 @@
+
+
+PATH=/bin:/usr/bin
+DIFF=/usr/bin/diff
+DIFF3=/usr/bin/diff3
+p=w
+case $1 in
+-p)
+	p='1,$p'
+	shift
+esac
+
+case $# in
+0|1|2)
+	echo >&2 "merge: usage: merge [-p] file1 file2 file3"
+	exit 1
+esac
+
+case $p in
+w)
+	if test ! -w $1
+	then
+		echo >&2 "$1 not writeable"
+		exit 1
+	fi
+esac
+
+trap 's=$?; rm -f /tmp/d3a$$ /tmp/d3b$$; exit $s' 0
+trap exit 1 2 3 13 15
+umask 077
+
+$DIFF $1 $3 >/tmp/d3a$$
+case $? in
+0|1) ;;
+*) exit
+esac
+
+$DIFF $2 $3 >/tmp/d3b$$
+case $? in
+0|1) ;;
+*) exit
+esac
+
+{
+	$DIFF3 -E /tmp/d3a$$ /tmp/d3b$$ $1 $2 $3 $4 $5
+	case $? in
+	0) ;;
+	1) echo >&2 merge: warning: 1 overlap during merge.;;
+	*) echo >&2 merge: warning: $? overlaps during merge.
+	esac
+	echo $p
+} | ed - $1