From: ville.mattila@...
Date: 2004-12-29T19:57:23+09:00
Subject: Re: Latest CVS HEAD ChangeLog has conflict marker


Same goes with 1.8.2 branch

 cvs diff -r 1.2673.2.748 -r 1.2673.2.749 ChangeLog
Index: ChangeLog
===================================================================
RCS file: /src/ruby/ChangeLog,v
retrieving revision 1.2673.2.748
retrieving revision 1.2673.2.749
diff -r1.2673.2.748 -r1.2673.2.749
0a1,5
> Wed Dec 29 11:07:07 2004  Dave Thomas  <dave@pragprog.com>
>
>       * lib/rdoc/generators/template/html/kilmer.rb: Update to use new
>         sections.
>
59a65
> >>>>>>> 1.3892


>From: ville.mattila@stonesoft.com
>Date: 12/29/2004 08:27:05
>Subject: Latest CVS HEAD ChangeLog has conflict marker
>
>Hi,
>
>Here are the details,
>
>cvs diff -up -r1.3892 -r 1.3893 ChangeLog | less
>Index: ChangeLog
>===================================================================
>RCS file: /src/ruby/ChangeLog,v
>retrieving revision 1.3892
>retrieving revision 1.3893
>diff -u -p -r1.3892 -r1.3893
>--- ChangeLog   28 Dec 2004 13:31:55 -0000      1.3892
>+++ ChangeLog   29 Dec 2004 02:16:31 -0000      1.3893
>@@ -1,3 +1,8 @@
>+Wed Dec 29 11:07:07 2004  Dave Thomas  <dave@pragprog.com>
>+
new
>+         sections.
>+
>
>* string.c (rb_str_justify): create buffer string after argument
>type
>@@ -57,6 +62,7 @@ Mon Dec 27 14:36:20 2004  NAKAMURA Usaku
>* process.c (NUM2RLIM, RLIM2NUM): Without SIZEOF_RLIM_T is not
>error.
>fixed: [ruby-dev:25346]
>
>+>>>>>>> 1.3892
>Sun Dec 26 16:21:39 2004  Shugo Maeda  <shugo@ruby-lang.org>
>
>* lib/net/imap.rb (Net::IMAP::PlainAuthenticator): added a new
>class
>
>
>