diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-22 19:50:04 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-22 19:50:04 -0800 |
| commit | 59af988b408a685b21600dedf0462298b8b7f16a (patch) | |
| tree | ecf677c6a8d2ef2b22d3683b88b91340fafc619b /admin/bzrmerge.el | |
| parent | 817b48a7bccb820203ae424aa14c559259a4f355 (diff) | |
| download | emacs-59af988b408a685b21600dedf0462298b8b7f16a.tar.gz | |
Add comments about fixing dates in merged ChangeLogs.
Diffstat (limited to 'admin/bzrmerge.el')
| -rw-r--r-- | admin/bzrmerge.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 77e64a862c8..33cbae22a6c 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -270,6 +270,9 @@ Does not make other difference." (sit-for 1) ;; (debug 'after-merge) ;; Check the conflicts. + ;; FIXME if using the helpful bzr changelog_merge plugin, + ;; there are normally no conflicts in ChangeLogs. + ;; But we still want the dates fixing, like bzrmerge-resolve does. (let ((conflicted nil) (files ())) (goto-char (point-min)) |