branch: scratch/add-vdiff
commit 2d48cb53ba36c3fd9e133acd9ca9bc40015036da
Author: Justin Burkett <[email protected]>
Commit: Justin Burkett <[email protected]>
vdiff-magit: Simplify resolve
---
vdiff-magit.el | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/vdiff-magit.el b/vdiff-magit.el
index b21f13a..b2aa6b8 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -190,17 +190,14 @@ conflicts, including those already resolved by Git, use
(vdiff-buffers3
mine other base
`(lambda (mine other base)
- (let ((orig-buf ,buf))
- (with-current-buffer orig-buf
- (when (yes-or-no-p (format "Conflict resolution finished; save
%s?"
- buffer-file-name))
- (erase-buffer)
- (insert-buffer-substring base)
- (save-buffer))))
- (when (buffer-live-p mine) (kill-buffer mine))
- (when (buffer-live-p other) (kill-buffer other))
- (when (buffer-live-p base) (kill-buffer base))
- (set-window-configuration ,config)))))))
+ (let ((orig-buf ,buf))
+ (with-current-buffer orig-buf
+ (when (yes-or-no-p (format "Conflict resolution finished; save
%s?"
+ buffer-file-name))
+ (erase-buffer)
+ (insert-buffer-substring base)
+ (save-buffer)))))
+ t t)))))
;;;###autoload
(defun vdiff-magit-stage (file)
