Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/pkg_install/dist/add Fix merge bug.



details:   https://anonhg.NetBSD.org/src/rev/57edb5fda02b
branches:  trunk
changeset: 982344:57edb5fda02b
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sat Apr 10 22:59:46 2021 +0000

description:
Fix merge bug.

diffstat:

 external/bsd/pkg_install/dist/add/main.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 38ecb08dad9c -r 57edb5fda02b external/bsd/pkg_install/dist/add/main.c
--- a/external/bsd/pkg_install/dist/add/main.c  Sat Apr 10 22:40:34 2021 +0000
+++ b/external/bsd/pkg_install/dist/add/main.c  Sat Apr 10 22:59:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.3 2021/04/10 19:49:59 nia Exp $     */
+/*     $NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $     */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD");
+__RCSID("$NetBSD: main.c,v 1.4 2021/04/10 22:59:46 wiz Exp $");
 
 /*
  *



Home | Main Index | Thread Index | Old Index