diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-06-05 18:10:07 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-06-05 18:10:07 -0400 |
| commit | 5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea (patch) | |
| tree | 28a9225469513c9b45226b36901d6bbb2637ce2b /admin/gitmerge.el | |
| parent | 9533ed8d05c347b513f8680ecde8d4120114b2b9 (diff) | |
| download | emacs-5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea.tar.gz | |
* admin/gitmerge.el (gitmerge-commit-message):
Revert to including "skipped" messages in ChangeLog once again.
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
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" |