Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 00:58:02 +0000 (02:58 +0200)
committermirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 00:58:02 +0000 (02:58 +0200)
1  2 
src/add.c

diff --combined src/add.c
+++ b/src/add.c
@@@ -34,6 -34,8 +34,6 @@@
  #include "save-cwd.h"
  #include "fileattr.h"
  
 -__RCSID("$MirOS: src/gnu/usr.bin/cvs/src/add.c,v 1.5 2016/10/22 00:54:33 tg Exp $");
 -
  static int add_directory (struct file_info *finfo);
  static int build_entry (const char *repository, const char *user,
                          const char *options, const char *message,
@@@ -533,7 -535,7 +533,7 @@@ add (int argc, char **argv
                        }
                        Register (entries, finfo.file, "0",
                                  timestamp ? timestamp :
-                                  vers->ts_user_ists ? "locally-added" : vers->ts_user,
+                                  vers->ts_user_ists ? "locally added" : vers->ts_user,
                                  vers->options, vers->tag, vers->date, NULL);
                        if (timestamp) free (timestamp);
  #ifdef SERVER_SUPPORT