2538 |
changes found in the master file; use \\[universal-argument] \\[vc-next-action] to do so." |
changes found in the master file; use \\[universal-argument] \\[vc-next-action] to do so." |
2539 |
(interactive) |
(interactive) |
2540 |
(vc-ensure-vc-buffer) |
(vc-ensure-vc-buffer) |
2541 |
|
;; Make sure buffer is saved. If the user says `no', abort since |
2542 |
|
;; we cannot show the changes and ask for confirmation to discard them. |
2543 |
|
(vc-buffer-sync nil) |
2544 |
(let ((file buffer-file-name) |
(let ((file buffer-file-name) |
2545 |
;; This operation should always ask for confirmation. |
;; This operation should always ask for confirmation. |
2546 |
(vc-suppress-confirm nil) |
(vc-suppress-confirm nil) |