summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2015...Paul Eggert2015-01-011-1/+1
* Merge from emacs-24Stefan Monnier2014-12-051-14/+11
* Spelling fix.Paul Eggert2014-11-281-4/+4
* admin: Add gitmerge.el...David Engster2014-11-271-0/+528