diff options
Diffstat (limited to 'lisp/vc/ediff-mult.el')
| -rw-r--r-- | lisp/vc/ediff-mult.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 1bdaca268e5..66d14e6b06d 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -1210,7 +1210,8 @@ behavior." (decoded-time-year time) (ediff-fill-leading-zero (decoded-time-hour time)) (ediff-fill-leading-zero (decoded-time-minute time)) - (ediff-fill-leading-zero (decoded-time-second time)))) + (ediff-fill-leading-zero (time-convert (decoded-time-second time) + 'integer)))) ;; Draw the directories (defun ediff-insert-dirs-in-meta-buffer (meta-list) |