emacs/admin/gitmerge.el, branch project-next Emacs is the extensible, customizable, self-documenting real-time display editor. Improve generated ChangeLog for gitmerge.el commits. (Bug#20717) 2015-06-11T01:13:51+00:00 Glenn Morris 2015-06-11T01:13:51+00:00 62afb85efbaaa1e8f4c2015486e7453614027141 * build-aux/gitlog-to-changelog: Handle gitmerge.el skipped commits. * admin/gitmerge.el (gitmerge-commit-message): Exclude "skipped" messages from ChangeLog once again. ; * ChangLog.2: Related fixes. 
* build-aux/gitlog-to-changelog: Handle gitmerge.el skipped commits.

* admin/gitmerge.el (gitmerge-commit-message):
Exclude "skipped" messages from ChangeLog once again.

; * ChangLog.2: Related fixes.
* admin/gitmerge.el (gitmerge-commit-message): 2015-06-05T22:10:07+00:00 Glenn Morris 2015-06-05T22:10:07+00:00 5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea Revert to including "skipped" messages in ChangeLog once again. 
Revert to including "skipped" messages in ChangeLog once again.
* admin/gitmerge.el (gitmerge-commit-message): 2015-06-02T06:16:03+00:00 Glenn Morris 2015-06-02T06:16:03+00:00 9b97b0402cd42334b8b2ed98df58b83b0fd41221 Exclude "skipped" messages from ChangeLog. 
Exclude "skipped" messages from ChangeLog.
Update copyright year to 2015 2015-01-01T22:26:41+00:00 Paul Eggert 2015-01-01T22:26:41+00:00 7e09ef09a479731d01b1ca46e94ddadd73ac98e3 Run admin/update-copyright. 
Run admin/update-copyright.
Merge from emacs-24 2014-12-05T20:20:02+00:00 Stefan Monnier 2014-12-05T20:20:02+00:00 fca389d1d3253c58e198efaa28d175106ce5022a 






Spelling fix.
2014-11-29T07:55:17+00:00

Paul Eggert

2014-11-29T07:54:57+00:00

dbff8fd118824163f4d2780fa8566cf92e1d8e86












admin: Add gitmerge.el
2014-11-27T17:22:00+00:00

David Engster

2014-11-27T17:22:00+00:00

f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2

* gitmerge.el: New file.





* gitmerge.el: New file.