Mercurial > emacs
changeset 59549:eda381049620
Fix commit conflicts.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 15 Jan 2005 11:48:58 +0000 |
| parents | 83df5808ec6b |
| children | ab8776511cbc |
| files | man/ChangeLog |
| diffstat | 1 files changed, 0 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/man/ChangeLog Sat Jan 15 02:30:02 2005 +0000 +++ b/man/ChangeLog Sat Jan 15 11:48:58 2005 +0000 @@ -117,10 +117,6 @@ * basic.texi (Moving Point): C-e now runs move-end-of-line. (Undo): Doc undo-outer-limit. -2004-12-11 Richard M. Stallman <rms@gnu.org> - - * Makefile.in (MAKEINFO): Add --force. - 2004-12-20 Jay Belanger <belanger@truman.edu> * calc.texi (Types Tutorial): Emphasize that you can't divide by @@ -146,7 +142,6 @@ the standard "The GNU Emacs Manual" in fifth argument of @xref's. (Dealing with HTTP documents): @inforef->@xref. ->>>>>>> 1.412 2004-12-15 Juri Linkov <juri@jurta.org> * mark.texi (Transient Mark, Mark Ring): M-< and other @@ -163,7 +158,6 @@ * calc.texi: Fix some TeX definitions. ->>>>>>> 1.407 2004-12-12 Juri Linkov <juri@jurta.org> * misc.texi (FFAP): Add C-x C-r, C-x C-v, C-x C-d, @@ -177,7 +171,6 @@ * mark.texi (Marking Objects): Marking commands also extend the region when mark is active in Transient Mark mode. ->>>>>>> 1.403 2004-12-09 Luc Teirlinck <teirllm@auburn.edu> * reftex.texi (Imprint): Remove erroneous @value's.