diff options
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)) |