;;; gitmerge.el --- help merge one Emacs branch into another
-;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
;; Authors: David Engster <deng@randomsample.de>
;; Stefan Monnier <monnier@iro.umontreal.ca>
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"