diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-06-01 23:16:03 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-06-01 23:16:03 -0700 |
| commit | 9b97b0402cd42334b8b2ed98df58b83b0fd41221 (patch) | |
| tree | e0ee941e5be831f95eb0b117850ac1449c117e22 /admin | |
| parent | e3a0f3daf12e208e88d712b09ef82096849b9431 (diff) | |
| download | emacs-9b97b0402cd42334b8b2ed98df58b83b0fd41221.tar.gz | |
* admin/gitmerge.el (gitmerge-commit-message):
Exclude "skipped" messages from ChangeLog.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 43773f5cb35..c6a3446c1d5 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -314,7 +314,8 @@ Returns non-nil if conflicts remain." SKIP denotes whether those commits are actually skipped. If END is nil, only the single commit BEG is merged." (with-temp-buffer - (insert "Merge from " branch "\n\n" + (insert (if skip "; " "") + "Merge from " branch "\n\n" (if skip (concat "The following commit" (if end "s were " " was ") |