* 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 c6a3446c1d52bef64ef4adbc078f4dde15750614..70dff295cd195936bf28a85c7d6d84245c1672dc 100644 (file)
--- 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"