Mercurial > emacs

comparison man/ChangeLog @ 64524:4b1847f05684

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflict markers.
author Andreas Schwab <schwab@suse.de>
date Wed, 20 Jul 2005 10:01:38 +0000
parents 2cd737c9eaea
children 2a5f7415db62 187d6a1f84f7
comparison
equal deleted inserted replaced
64523:da15be47f5c0 64524:4b1847f05684
1 2005-07-19 Carsten Dominik <dominik@science.uva.nl> 1 2005-07-19 Carsten Dominik <dominik@science.uva.nl>
2 2
3 * org.texi: Version 3.14 3 * org.texi: Version 3.14
4 4
5 <<<<<<< ChangeLog
6 2005-07-04 Carsten Dominik <dominik@science.uva.nl> 5 2005-07-04 Carsten Dominik <dominik@science.uva.nl>
7 6
8 * org.texi: Version 3.13 7 * org.texi: Version 3.13
9 8
10 =======
11 2005-07-19 Juri Linkov <juri@jurta.org> 9 2005-07-19 Juri Linkov <juri@jurta.org>
12 10
13 * files.texi (Comparing Files): Mention resync for `compare-windows'. 11 * files.texi (Comparing Files): Mention resync for `compare-windows'.
14 12
15 2005-07-18 Juri Linkov <juri@jurta.org> 13 2005-07-18 Juri Linkov <juri@jurta.org>