summaryrefslogtreecommitdiff
path: root/doc/misc/ediff.texi
Commit message (Expand)AuthorAgeFilesLines
* Merge from origin/emacs-26Paul Eggert2018-12-311-1/+1
|\
| * Fix copyright years by handPaul Eggert2019-01-011-1/+1
* | Use "file name handler" consequentlyMichael Albinus2018-12-221-1/+1
|/
* Improve documentation of Ediff wordwise commandsEli Zaretskii2018-11-271-7/+6
* Fix use of @key in Texinfo manualsEli Zaretskii2018-04-191-1/+1
* Remove @key{} markups from @kindex entries in manualsMichael Albinus2018-02-261-2/+2
* Fix @kindex entries in manualsMichael Albinus2018-02-251-4/+4
* Fix @findex and @vindex entries in manualsMichael Albinus2018-02-231-4/+4
* Tiny doc/misc markup fixesGlenn Morris2018-02-221-1/+1
* Fix copyright years by handPaul Eggert2018-01-011-1/+1
* Show ancestor buffer in 3way mergesTino Calancha2017-03-141-2/+6
* Fix copyright years by handPaul Eggert2017-01-011-1/+1
* Clarify usage of 'ediff-cleanup-hook' (Bug#24675)Philipp Stephani2016-12-231-3/+8
* Fix copyright years by handPaul Eggert2016-01-011-1/+1
* Restore some of the quoting in the manualsEli Zaretskii2015-09-161-1/+1
* Prefer plain characters to Texinfo circumlocutionsPaul Eggert2015-05-011-2/+2
* Fix single-quoting style in PDF manualsPaul Eggert2015-05-011-1/+1
* Minor quoting etc. fixes to misc manualsPaul Eggert2015-04-111-27/+33
* Fix copyright years by handPaul Eggert2015-01-011-1/+1
* Remove remaining mentions of VMS as a hostReuben Thomas2014-08-071-7/+1
* Add .info extension to @setfilename commands in doc/Glenn Morris2014-06-091-1/+1
* Standardize case of "Front-Cover Texts" in texi file permissions notices.Glenn Morris2014-05-071-1/+1
* Specify .texi encoding.Paul Eggert2014-01-051-0/+1
* Fix copyright years by hand.Paul Eggert2014-01-011-1/+1
* Revert @documentencoding changes in the docs.Eli Zaretskii2013-12-301-2/+0
* Specify info encoding and language.Paul Eggert2013-12-291-0/+2
* Add support for auto-generating info/dirGlenn Morris2013-12-111-1/+2
* Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.orgGlenn Morris2013-02-121-1/+1
|\
| * In doc, use standard American English style for e.g., etc., i.e.Paul Eggert2013-02-121-1/+1
* | Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.caPaul Eggert2013-01-021-1/+1
|\ \ | |/
| * Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* | Remove more hand-written node pointers in doc/miscGlenn Morris2012-12-221-26/+26
|/
* Hyphen and dash fixes in texinfo files.Paul Eggert2012-12-221-5/+5
* Don't say "buying copies from the FSF" for manuals they do not publishGlenn Morris2012-12-211-2/+1
* Fix minor whitespace issues after "." in manual.Paul Eggert2012-12-051-24/+24
* Cleanup uses of "-hooks".Stefan Monnier2012-10-231-1/+1
* Standardize possessive apostrophe usage in manuals, docs, and commentsGlenn Morris2012-02-281-1/+1
* * doc/misc/ediff.texi (Quick Help Commands): Add a couple of index entries.Chong Yidong2012-02-261-0/+2
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Fix typos.Juanma Barranquero2011-11-141-1/+1
* Remove mention of `require' in ediff.texiLars Magne Ingebrigtsen2011-07-071-12/+0
* Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.caGlenn Morris2011-02-191-1/+1
|\
| * Synchronize @dircategory directives in doc/misc with info/dir.Eli Zaretskii2011-02-181-1/+1
* | Add @top to some misc/*.texi files.Glenn Morris2011-02-121-1/+1
* | Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
* | Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|\ \ | |/
| * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
* | Don't be so lax with spelling.Glenn Morris2010-11-021-5/+2
|/
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
* 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2009-08-151-98/+104