From: Glenn Morris <rgm@gnu.org>
Date: Tue, 2 Jun 2015 06:16:03 +0000 (-0700)
Subject: * admin/gitmerge.el (gitmerge-commit-message):
X-Git-Tag: emacs-25.0.90~1901
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b97b0402cd42334b8b2ed98df58b83b0fd41221;p=emacs.git

* admin/gitmerge.el (gitmerge-commit-message):

Exclude "skipped" messages from ChangeLog.
---

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 ")