summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-merg.el
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2019Paul Eggert2019-01-011-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
* ; Fix a typo in ediff-merg.elTino Calancha2017-01-211-1/+1
* Update copyright year to 2017Paul Eggert2016-12-311-1/+1
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
* Fix minor text quoting in calc, calendar, vcPaul Eggert2015-08-281-2/+2
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
* 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-4/+1
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-2/+1
* Nuke arch-tags.Glenn Morris2011-01-151-1/+0
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
* Add "Package:" file headers to denote built-in packages.Chong Yidong2010-08-291-0/+1
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-0/+397