diff options
| author | Glenn Morris | 2015-06-05 18:10:07 -0400 |
|---|---|---|
| committer | Glenn Morris | 2015-06-05 18:10:07 -0400 |
| commit | 5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea (patch) | |
| tree | 28a9225469513c9b45226b36901d6bbb2637ce2b /admin | |
| parent | 9533ed8d05c347b513f8680ecde8d4120114b2b9 (diff) | |
| download | emacs-5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea.tar.gz emacs-5977a07d949a60b66d0f2310fbd4dbd06cd0b9ea.zip | |
* admin/gitmerge.el (gitmerge-commit-message):
Revert to including "skipped" messages in ChangeLog once again.
Diffstat (limited to 'admin')
| -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." | |||
| 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 "; " "") | 317 | (insert ; (if skip "; " "") ; I have no idea what to do for this |
| 318 | "Merge from " branch "\n\n" | 318 | "Merge from " branch "\n\n" |
| 319 | (if skip | 319 | (if skip |
| 320 | (concat "The following commit" | 320 | (concat "The following commit" |