summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-diff.el
Commit message (Expand)AuthorAgeFilesLines
* ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
* ediff: Merges with ancestor: Fix computation of hunks and proposed mergeOlivier Certner2022-11-171-14/+21
* Improve the ediff-diff-options documentationLars Ingebrigtsen2022-02-071-1/+4
* ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* ; More stylistic docfixes in vc/*.el found by checkdocStefan Kangas2021-09-181-18/+14
* ; More minor docfixes found by checkdocStefan Kangas2021-09-141-4/+3
* Remove messaging in ediff-make-diff2-bufferLars Ingebrigtsen2021-05-311-4/+1
* Fix ediff message parsing in non-English localesLars Ingebrigtsen2021-05-271-1/+4
* lisp/vc/*.el: Use lexical-bindings in all the filesStefan Monnier2021-02-261-1/+1
* Prefer defvar-local in vc/*.elStefan Kangas2021-01-311-10/+5
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* Shorten over-wide docstrings in variablesStefan Kangas2020-12-191-1/+1
* Fix problem with non-ASCII characters in ediff error messagesLars Ingebrigtsen2020-08-201-0/+4
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* Remove most of the XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-051-2/+1
* Remove some XEmacs compat code from ediff*.elLars Ingebrigtsen2019-10-041-1/+1
* * lisp/vc/ediff-*.el: Use lexical-binding, plus misc cleanupStefan Monnier2019-06-211-64/+42
* Disable lexical-binding in ediffGlenn Morris2019-06-181-1/+1
* Use lexical binding for ediffAlex Branham2019-06-091-1/+1
* Update copyright year to 2019Paul Eggert2019-01-011-1/+1
* ; Use GNU not Gnu in docsGlenn Morris2018-03-231-1/+1
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
* ediff: use user-error rather than debug-ignored-errorsGlenn Morris2017-04-171-1/+1
* Check that file argument is a stringKaushal Modi2017-04-071-7/+16
* Make ediff handle remote and quoted file namesPhilipp Stephani2017-04-041-1/+5
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* | Add file-local-nameMichael Albinus2016-11-201-4/+2
|/
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Backslash cleanup in Elisp source filesPaul Eggert2015-09-171-1/+1
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-1/+1
* Prefer directed to neutral quotesPaul Eggert2015-08-241-1/+1
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* * lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):Stefan Monnier2014-05-021-3/+2
* Fix application of dolist to a vector (Bug#17257).YAMAMOTO Mitsuharu2014-04-141-2/+3
* Ediff's overlay priorities cause more trouble than they solve.Stefan Monnier2014-04-101-15/+3
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
* * lisp/dired-x.el:Daniel Hackney2013-09-041-2/+2
* Silence ediff compilationGlenn Morris2013-05-231-3/+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
* | Obsolete longlines.el.Chong Yidong2012-12-041-98/+47
|/
* * vc/ediff.el (ediff-directories): Add trailing space to prompts.Michael Albinus2012-07-161-12/+21
* * vc/ediff-diff.el (ediff-same-file-contents): Fix it for remoteMichael Albinus2012-07-031-3/+8
* Remove * characters from the front of variable docstrings.Chong Yidong2012-04-091-9/+9
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Fix typos.Juanma Barranquero2011-11-201-1/+1
* Don't quote lambda expressions with `quote'.Stefan Monnier2011-05-231-1/+1