procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Revert to including "skipped" messages in ChangeLog once again.
This commit is contained in:
Glenn Morris 2015-06-05 18:10:07 -04:00
parent 9533ed8d05
commit 5977a07d94
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/gitmerge.el
View file

@ -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"