Mercurial > emacs

changeset 52809:8471c440544b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolve CVS conflicts
author Miles Bader <miles@gnu.org>
date Wed, 08 Oct 2003 05:10:43 +0000
parents bd3047570b72
children f49c1c4d92de
files lisp/ChangeLog lisp/ChangeLog.10
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Oct 08 03:16:58 2003 +0000
+++ b/lisp/ChangeLog	Wed Oct 08 05:10:43 2003 +0000
@@ -1900,4 +1900,4 @@
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
-;;; arch-tag: 5fcf8004-6f58-452a-b9d6-6950323a19c1
+;;; arch-tag: e39939be-dab3-400e-86f5-0e2701a883c1
--- a/lisp/ChangeLog.10	Wed Oct 08 03:16:58 2003 +0000
+++ b/lisp/ChangeLog.10	Wed Oct 08 05:10:43 2003 +0000
@@ -23539,3 +23539,5 @@
     Copyright (C) 2001, 2002 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
+
+;;; arch-tag: 5fcf8004-6f58-452a-b9d6-6950323a19c1