[Emacs-diffs] master 9b97b04: * admin/gitmerge.el (gitmerge-commit-message):

[Glenn Morris]

branch: master
commit 9b97b0402cd42334b8b2ed98df58b83b0fd41221
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/gitmerge.el (gitmerge-commit-message):
    
    Exclude "skipped" messages from ChangeLog.
---
 admin/gitmerge.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 43773f5..c6a3446 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 ")