BSD 4_4 release

[unix-history] / usr / src / usr.bin / diff / diff3 / diff3.sh

diff --git a/usr/src/usr.bin/diff/diff3/diff3.sh b/usr/src/usr.bin/diff/diff3/diff3.sh
index f5e3e12..a9a42bf 100644 (file)
--- a/usr/src/usr.bin/diff/diff3/diff3.sh
+++ b/usr/src/usr.bin/diff/diff3/diff3.sh
@@ -1,7 +1,15 @@
-#! /bin/sh
+#!/bin/sh -

 #
 #

-#      diff3.sh        4.1     83/02/10
+# Copyright (c) 1991, 1993
+#      The Regents of the University of California.  All rights reserved.

 #
 #

+# This module is believed to contain source code proprietary to AT&T.
+# Use and redistribution is subject to the Berkeley Software License
+# Agreement and your Software Agreement with AT&T (Western Electric).
+#
+#      @(#)diff3.sh    8.1 (Berkeley) 6/6/93
+#
+

 e=
 case $1 in
 -*)
 e=
 case $1 in
 -*)


@@ -18,4 +26,4 @@ fi
 trap "rm -f /tmp/d3[ab]$$" 0 1 2 13 15
 diff $1 $3 >/tmp/d3a$$
 diff $2 $3 >/tmp/d3b$$
 trap "rm -f /tmp/d3[ab]$$" 0 1 2 13 15
 diff $1 $3 >/tmp/d3a$$
 diff $2 $3 >/tmp/d3b$$

-/usr/lib/diff3 $e /tmp/d3[ab]$$ $1 $2 $3
+/usr/libexec/diff3 $e /tmp/d3[ab]$$ $1 $2 $3