Mercurial > hg > xemacs-beta

diff netinstall/ChangeLog @ 863:42375619fa45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-04 06:03:59 by andyp] merge 21.4 windows changes, minimally tested
author andyp
date Tue, 04 Jun 2002 06:05:53 +0000
parents 2b6fa2618f76
children 5b3cf2203477
line wrap: on
line diff
--- a/netinstall/ChangeLog	Mon Jun 03 12:24:14 2002 +0000
+++ b/netinstall/ChangeLog	Tue Jun 04 06:05:53 2002 +0000
@@ -451,3 +451,9 @@
 
 	* all: port from cygwin setup.
 
+<<<<<<< ChangeLog
+=======
+%%% $Id: ChangeLog,v 1.18 2002/06/04 06:04:38 andyp Exp $
+$Revision: 1.18 $
+
+>>>>>>> 1.2.2.11.2.10