[Emacs-diffs] Changes to emacs/man/ChangeLog

[Andreas Schwab]

Index: emacs/man/ChangeLog
diff -c emacs/man/ChangeLog:1.632 emacs/man/ChangeLog:1.633
*** emacs/man/ChangeLog:1.632   Tue Jul 19 16:58:19 2005
--- emacs/man/ChangeLog Wed Jul 20 10:01:38 2005
***************
*** 2,13 ****
  
        * org.texi: Version 3.14
  
- <<<<<<< ChangeLog
  2005-07-04  Carsten Dominik  <address@hidden>
  
        * org.texi: Version 3.13
  
- =======
  2005-07-19  Juri Linkov  <address@hidden>
  
        * files.texi (Comparing Files): Mention resync for `compare-windows'.
--- 2,11 ----