Commit 5977a07d authored by Glenn Morris's avatar Glenn Morris

* admin/gitmerge.el (gitmerge-commit-message):

Revert to including "skipped" messages in ChangeLog once again.
parent 9533ed8d
......@@ -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."
(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"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment