From 5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 5 Jun 2015 18:10:07 -0400 Subject: [PATCH] * admin/gitmerge.el (gitmerge-commit-message): Revert to including "skipped" messages in ChangeLog once again. --- admin/gitmerge.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- 2.39.5