diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 16:42:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-22 16:42:42 -0700 |
| commit | ddd9111a90f59abedd5065bfb7ac53454f816780 (patch) | |
| tree | ab6b478e8645787a421319ff4c13c16d9f9e8199 /lisp/emacs-lisp/edebug.el | |
| parent | 4fab26ba5ac381ce836eff521fc56d8d28570221 (diff) | |
| download | emacs-ddd9111a90f59abedd5065bfb7ac53454f816780.tar.gz emacs-ddd9111a90f59abedd5065bfb7ac53454f816780.tar.bz2 emacs-ddd9111a90f59abedd5065bfb7ac53454f816780.zip | |
Compute a better commit message for merges
Problem reported by David Engster in:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html
* admin/gitmerge.el (gitmerge-commit-message):
Truncate the computed commit message to at most 72 characters per line.
(gitmerge-maybe-resume): Don’t use "-" as the commit message for
merges; use the computed commit message instead.
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
0 files changed, 0 insertions, 0 deletions