===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/logmsg.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/cvs/logmsg.c	2016/10/15 22:20:17	1.59
--- src/usr.bin/cvs/logmsg.c	2017/05/28 16:57:01	1.60
***************
*** 1,4 ****
! /*	$OpenBSD: logmsg.c,v 1.59 2016/10/15 22:20:17 millert Exp $	*/
  /*
   * Copyright (c) 2007 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: logmsg.c,v 1.60 2017/05/28 16:57:01 joris Exp $	*/
  /*
   * Copyright (c) 2007 Joris Vink <joris@openbsd.org>
   *
***************
*** 155,161 ****
  	}
  
  	fprintf(fp, "%s %s\n%s Enter Log.  Lines beginning with `%s' are "
! 	    "removed automatically\n%s\n", CVS_LOGMSG_PREFIX, CVS_LOGMSG_LINE,
  	    CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX);
  
  	if (cvs_cmdop == CVS_OP_COMMIT) {
--- 155,161 ----
  	}
  
  	fprintf(fp, "%s %s\n%s Enter Log.  Lines beginning with `%s' are "
! 	    "removed automatically\n%s \n", CVS_LOGMSG_PREFIX, CVS_LOGMSG_LINE,
  	    CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX, CVS_LOGMSG_PREFIX);
  
  	if (cvs_cmdop == CVS_OP_COMMIT) {
***************
*** 166,172 ****
  	if (added != NULL && !RB_EMPTY(added)) {
  		fprintf(fp, "%s Added Files:", CVS_LOGMSG_PREFIX);
  		RB_FOREACH(cf, cvs_flisthead, added)
! 			fprintf(fp, "\n%s\t%s", CVS_LOGMSG_PREFIX,
  			    dir != NULL ? basename(cf->file_path) :
  			    cf->file_path);
  		fputs("\n", fp);
--- 166,172 ----
  	if (added != NULL && !RB_EMPTY(added)) {
  		fprintf(fp, "%s Added Files:", CVS_LOGMSG_PREFIX);
  		RB_FOREACH(cf, cvs_flisthead, added)
! 			fprintf(fp, "\n%s \t%s ", CVS_LOGMSG_PREFIX,
  			    dir != NULL ? basename(cf->file_path) :
  			    cf->file_path);
  		fputs("\n", fp);
***************
*** 175,181 ****
  	if (removed != NULL && !RB_EMPTY(removed)) {
  		fprintf(fp, "%s Removed Files:", CVS_LOGMSG_PREFIX);
  		RB_FOREACH(cf, cvs_flisthead, removed)
! 			fprintf(fp, "\n%s\t%s", CVS_LOGMSG_PREFIX,
  			    dir != NULL ? basename(cf->file_path) :
  			    cf->file_path);
  		fputs("\n", fp);
--- 175,181 ----
  	if (removed != NULL && !RB_EMPTY(removed)) {
  		fprintf(fp, "%s Removed Files:", CVS_LOGMSG_PREFIX);
  		RB_FOREACH(cf, cvs_flisthead, removed)
! 			fprintf(fp, "\n%s \t%s ", CVS_LOGMSG_PREFIX,
  			    dir != NULL ? basename(cf->file_path) :
  			    cf->file_path);
  		fputs("\n", fp);
***************
*** 184,190 ****
  	if (modified != NULL && !RB_EMPTY(modified)) {
  		fprintf(fp, "%s Modified Files:", CVS_LOGMSG_PREFIX);
  		RB_FOREACH(cf, cvs_flisthead, modified)
! 			fprintf(fp, "\n%s\t%s", CVS_LOGMSG_PREFIX,
  			    dir != NULL ? basename(cf->file_path) :
  			    cf->file_path);
  		fputs("\n", fp);
--- 184,190 ----
  	if (modified != NULL && !RB_EMPTY(modified)) {
  		fprintf(fp, "%s Modified Files:", CVS_LOGMSG_PREFIX);
  		RB_FOREACH(cf, cvs_flisthead, modified)
! 			fprintf(fp, "\n%s \t%s ", CVS_LOGMSG_PREFIX,
  			    dir != NULL ? basename(cf->file_path) :
  			    cf->file_path);
  		fputs("\n", fp);