diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 70dff295cd1..c8cf2dcc565 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -314,7 +314,10 @@ Returns non-nil if conflicts remain." | |||
| 314 | SKIP denotes whether those commits are actually skipped. If END | 314 | SKIP denotes whether those commits are actually skipped. If END |
| 315 | is nil, only the single commit BEG is merged." | 315 | is nil, only the single commit BEG is merged." |
| 316 | (with-temp-buffer | 316 | (with-temp-buffer |
| 317 | (insert ; (if skip "; " "") ; I have no idea what to do for this | 317 | ;; We do not insert "; " for non-skipped messages, |
| 318 | ;; because the date of those entries is helpful in figuring out | ||
| 319 | ;; when things got merged, since git does not track that. | ||
| 320 | (insert (if skip "; " "") | ||
| 318 | "Merge from " branch "\n\n" | 321 | "Merge from " branch "\n\n" |
| 319 | (if skip | 322 | (if skip |
| 320 | (concat "The following commit" | 323 | (concat "The following commit" |