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

[Glenn Morris]

branch: master
commit 5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/gitmerge.el (gitmerge-commit-message):
    
    Revert to including "skipped" messages in ChangeLog once again.
---
 admin/gitmerge.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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