summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-help.el
AgeCommit message (Expand)Author
2017-04-17ediff: use user-error rather than debug-ignored-errorsGlenn Morris
2017-03-14Show ancestor buffer in 3way mergesTino Calancha
2016-12-31Update copyright year to 2017Paul Eggert
2016-01-01Update copyright year to 2016Paul Eggert
2015-06-02Support quotes 'like this' in info filesPaul Eggert
2015-05-26Handle curved quotes in info filesPaul Eggert
2015-01-01Update copyright year to 2015Paul Eggert
2014-01-01Update copyright year to 2014 by running admin/update-copyright.Paul Eggert
2013-08-05Do not call to `selected-window' where it is assumed by default.Dmitry Antipov
2013-01-01Update copyright notices for 2013.Paul Eggert
2012-01-05Add 2012 to FSF copyright years for Emacs filesGlenn Morris
2011-11-26Spelling fixes.Paul Eggert
2011-01-24Convert consecutive FSF copyright years to ranges.Glenn Morris
2011-01-15Nuke arch-tags.Glenn Morris
2011-01-14Merge from emacs-23Stefan Monnier
2010-08-29Add "Package:" file headers to denote built-in packages.Chong Yidong
2010-06-11Move version control related files to the "vc" subdirectory.Juri Linkov