Improve generated ChangeLog for gitmerge.el commits. (Bug#20717)

* build-aux/gitlog-to-changelog: Handle gitmerge.el skipped commits.

* admin/gitmerge.el (gitmerge-commit-message):
Exclude "skipped" messages from ChangeLog once again.

; * ChangLog.2: Related fixes.

1 files changed, 4 insertions, 1 deletions

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 70dff295cd1..c8cf2dcc565 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -314,7 +314,10 @@ 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 "; " "") ; I have no idea what to do for this
+    ;; We do not insert "; " for non-skipped messages,
+    ;; because the date of those entries is helpful in figuring out
+    ;; when things got merged, since git does not track that.
+    (insert (if skip "; " "")
             "Merge from " branch "\n\n"
             (if skip
                 (concat "The following commit"