projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
6573f0f
..
a9a42bf
100644
(file)
--- a/
usr/src/usr.bin/diff/diff3/diff3.sh
+++ b/
usr/src/usr.bin/diff/diff3/diff3.sh
@@
-1,11
+1,13
@@
#!/bin/sh -
#
#!/bin/sh -
#
-# Copyright (c) 1991
The Regents of the University of California.
-# All rights reserved.
+# Copyright (c) 1991
, 1993
+#
The Regents of the University of California.
All rights reserved.
#
#
-# %sccs.include.proprietary.sh%
+# 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
4.3 (Berkeley) %G%
+# @(#)diff3.sh
8.1 (Berkeley) 6/6/93
#
e=
#
e=