[BACK]Return to diff3.ksh CVS log [TXT][DIR] Up to [local] / src / usr.bin / diff3

Diff for /src/usr.bin/diff3/diff3.ksh between version 1.4 and 1.5

version 1.4, 2006/02/22 22:35:11 version 1.5, 2019/01/25 00:19:26
Line 2 
Line 2 
 #  #
 # $OpenBSD$  # $OpenBSD$
 #  #
 # Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>  # Copyright (c) 2003 Todd C. Miller <millert@openbsd.org>
 #  #
 # Permission to use, copy, modify, and distribute this software for any  # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above  # purpose with or without fee is hereby granted, provided that the above

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5