On Sun, Nov 13, 2005 at 08:07:41PM +0000, Alistair G. Crooks wrote:
> 
> Module Name:	src
> Committed By:	agc
> Date:		Sun Nov 13 20:07:41 UTC 2005
> 
> Modified Files:
> 	src/usr.sbin/pkg_install/lib: dewey.c
> 
> Log Message:
> The Dewey number comparison routines were added by myself in 2002 in
> revision 1.32 of pkg_install/lib/str.c, and have absolutely nothing to
> do with the original FreeBSD utilities.
> 
> Place the appropriate (3 clause) copyright on this file.

Please don't commit conflicts:
@@ -1,13 +1,16 @@
+<<<<<<< dewey.c
+/* $NetBSD$ */
+=======
 /*     $NetBSD$        */
 
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
+>>>>>>> 1.4

 Thomas