Date: Fri, 15 Jan 1999 20:52:52 +0800 From: Peter Wemm <peter@netplex.com.au> To: Mark Murray <markm@FreeBSD.ORG> Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: src/contrib/texinfo/info signals.c terminal.c src/contrib/texinfo/makeinfo makeinfo.c src/contrib/texinfo/util install-info.c Message-ID: <199901151252.UAA85699@spinner.netplex.com.au> In-Reply-To: Your message of "Fri, 15 Jan 1999 04:38:12 PST." <199901151238.EAA08892@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Mark Murray wrote: > markm 1999/01/15 04:38:12 PST > > Modified files: > contrib/texinfo/info signals.c > Log: > Break cvs merge > > Revision Changes Path > 1.4 +0 -9 src/contrib/texinfo/info/signals.c This has spammed the rest of rev 1.2, which was an intentional addition. > Modified files: > contrib/texinfo/makeinfo makeinfo.c > contrib/texinfo/util install-info.c > Log: > Fix CVS merge breakage. > > Revision Changes Path > 1.6 +0 -47 src/contrib/texinfo/makeinfo/makeinfo.c This re-broke it a few minutes after I just made it compile by completing xrealloc - you left the second half behind somehow. cvs update should have flagged the conflict.. > 1.8 +6 -48 src/contrib/texinfo/util/install-info.c This spammed all the freebsd modifications to this file... The build uses them. Cheers, -Peter To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901151252.UAA85699>