From 9b97b0402cd42334b8b2ed98df58b83b0fd41221 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 1 Jun 2015 23:16:03 -0700 Subject: [PATCH] * admin/gitmerge.el (gitmerge-commit-message): Exclude "skipped" messages from ChangeLog. --- admin/gitmerge.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 43773f5cb35..c6a3446c1d5 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -314,7 +314,8 @@ 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 "Merge from " branch "\n\n" + (insert (if skip "; " "") + "Merge from " branch "\n\n" (if skip (concat "The following commit" (if end "s were " " was ") -- 2.39.5