From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog.4 Date: Wed, 17 May 2023 14:25:17 +0300 Message-ID: <83ttwbxkrm.fsf@gnu.org> References: <874job5p3n.fsf.ref@yahoo.com> <874job5p3n.fsf@yahoo.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40137"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Po Lu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 17 13:26:23 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pzFIU-000AC4-HY for ged-emacs-devel@m.gmane-mx.org; Wed, 17 May 2023 13:26:22 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzFHn-0002u3-QY; Wed, 17 May 2023 07:25:40 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzFHf-0002tp-1w for emacs-devel@gnu.org; Wed, 17 May 2023 07:25:32 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzFHR-0002Xa-Qm; Wed, 17 May 2023 07:25:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=X5pYL4mbSFhg3JftUle2GriNSTZBmuNNm4u3ChWunDw=; b=qhCaa3UegJK1 GF1JOs5CoeD+Z6LHoujRHccpsfEK32AKMGiH7yt+HJekoDjulbN9pUB2n6MCEC8yKVfXu2HxmCxvk uVb2iEIyyL4+0JhRKATHsSqZ0C0URUmioRaWZaaSpzj1DvQNg8RE1aagl7ZLHuOHlTSsiUdYHuaUA Gr9vTpE0p38wLRSl13YR5BBru974SCFoZKsZKbVuRDBnBSi+HKZIA65cj4VblMNr7hKeuofeagcM4 s2vb3fkf7NLojngVxY3MF8RWv+LVeoUoP63XaLko8O5H9u7w1vNfLzmGDTwuSACmFg6C1gLqBm/7z JE8YXwDLNj0wKyIpmkMEgg==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzFHI-0001b0-1B; Wed, 17 May 2023 07:25:17 -0400 In-Reply-To: <874job5p3n.fsf@yahoo.com> (message from Po Lu on Wed, 17 May 2023 16:39:08 +0800) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:306157 Archived-At: > From: Po Lu > Date: Wed, 17 May 2023 16:39:08 +0800 > > Every change after: > > 2022-04-04 Eli Zaretskii > > * Version 28.1 released. > > appears to have been made on: > > 2023-04-15 Eli Zaretskii > 2023-04-15 Po Lu > > in ChangeLog.4. Would someone please look into this? Some kind of gitmerge snafu, it seems. I fixed that by copying the correct version from the release branch over the corrupted one.