summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-merg.el
Commit message (Expand)AuthorAge
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-01
* Further audits of single quotes in Lisp doc stringsLars Ingebrigtsen2022-05-24
* ; Add 2022 to copyright years.Eli Zaretskii2022-01-01
* ; Adjust overly long docstrings to fit 80 charactersStefan Kangas2021-09-26
* ; More minor docfixes found by checkdocStefan Kangas2021-09-14
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-26
* Update copyright year to 2021Paul Eggert2021-01-01
* Shorten over-wide docstrings in defcustomsStefan Kangas2020-12-19
* Update copyright year to 2020Paul Eggert2020-01-01
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-21
* Disable lexical-binding in ediffGlenn Morris2019-06-18
* Use lexical binding for ediffAlex Branham2019-06-09
* Merge from origin/emacs-26Paul Eggert2018-12-31
|\
| * Update copyright year to 2019Paul Eggert2019-01-01
* | Replace uses of the obsolete local-write-file-hooksGlenn Morris2018-03-08
|/
* Update copyright year to 2018Paul Eggert2018-01-01
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-13
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-17
* ; Fix a typo in ediff-merg.elTino Calancha2017-01-21
* Update copyright year to 2017Paul Eggert2016-12-31
* Update copyright year to 2016Paul Eggert2016-01-01
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-28
* Update copyright year to 2015Paul Eggert2015-01-01
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-01
* * lisp/dired-x.el:Daniel Hackney2013-09-04
* Silence ediff compilationGlenn Morris2013-05-23
* Update copyright notices for 2013.Paul Eggert2013-01-01
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-05
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-24
* Nuke arch-tags.Glenn Morris2011-01-15
* Merge from emacs-23Stefan Monnier2011-01-14
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-29
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-11
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 16:47:50 +0000