1704 |
(message "Retrieving revision %s... Done" rev) |
(message "Retrieving revision %s... Done" rev) |
1705 |
(current-buffer)))))) |
(current-buffer)))))) |
1706 |
|
|
|
(eval-and-compile (autoload 'smerge-ediff "smerge-mode")) |
|
|
|
|
1707 |
;; FIXME: The user should be able to specify ancestor/head/backup and we should |
;; FIXME: The user should be able to specify ancestor/head/backup and we should |
1708 |
;; provide sensible defaults when merge info is unavailable (rather than rely |
;; provide sensible defaults when merge info is unavailable (rather than rely |
1709 |
;; on smerge-ediff). Also provide sane defaults for need-merge files. |
;; on smerge-ediff). Also provide sane defaults for need-merge files. |