[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
|
From: |
Katsumi Yamaoka |
|
Subject: |
Re: merge conlict? |
|
Date: |
Thu, 28 Jan 2010 13:13:10 +0900 |
|
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.1.91 (gnu/linux) |
>>>>> Eli Zaretskii wrote:
>> Date: Thu, 28 Jan 2010 11:10:39 +0900
>> From: Katsumi Yamaoka <address@hidden>
>>
>> BTW, may I fix the last bogus commit in trunk/doc/misc/ChangeLog ?
> Fix how?
Probably this is the correct one:
--- ChangeLog~ 2010-01-25 21:56:40 +0000
+++ ChangeLog 2010-01-28 04:11:15 +0000
@@ -1,8 +1,8 @@
-2010-01-24 Mark A. Hershberger <address@hidden>
+2010-01-21 Katsumi Yamaoka <address@hidden>
* gnus.texi (Score File Format): Fix typo.
-2010-01-21 Katsumi Yamaoka <address@hidden>
+2010-01-19 Mark A. Hershberger <address@hidden>
* cc-mode.texi: Replace references to obsolete c-subword-mode.
I've never modified cc-mode.texi. ;-)