From: Glenn Morris <rgm@gnu.org>
Date: Fri, 5 Jun 2015 22:10:07 +0000 (-0400)
Subject: * admin/gitmerge.el (gitmerge-commit-message):
X-Git-Tag: emacs-25.0.90~1853
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea;p=emacs.git

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

Revert to including "skipped" messages in ChangeLog once again.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index c6a3446c1d5..70dff295cd1 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -314,7 +314,7 @@ 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 (if skip "; " "")
+    (insert ; (if skip "; " "") ; I have no idea what to do for this
 	    "Merge from " branch "\n\n"
 	    (if skip
 		(concat "The following commit"