From 0c1f170e4435b164f5e7113444fefb86cb5c34d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Vanicat?= Date: Thu, 13 May 2010 16:26:12 +0800 Subject: [PATCH] Use magit-git-output instead of magit-git-string in magit-interactive-resolve closes #1: magit-git-string was responsible for trimming the last \n --- magit.el | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/magit.el b/magit.el index 1b8e679a..2c90133f 100644 --- a/magit.el +++ b/magit.el @@ -3998,16 +3998,13 @@ With prefix force the removal even it it hasn't been merged." (error "Cannot resolve %s" file)) (with-current-buffer base-buffer (if (string-match "^[0-9]+ [0-9a-f]+ 1" merge-status) - (insert (magit-git-string "cat-file" "blob" - (concat ":1:" file))))) + (insert (magit-git-output `("cat-file" "blob" ,(concat ":1:" file)))))) (with-current-buffer our-buffer (if (string-match "^[0-9]+ [0-9a-f]+ 2" merge-status) - (insert (magit-git-string "cat-file" "blob" - (concat ":2:" file))))) + (insert (magit-git-output `("cat-file" "blob" ,(concat ":2:" file)))))) (with-current-buffer their-buffer (if (string-match "^[0-9]+ [0-9a-f]+ 3" merge-status) - (insert (magit-git-string "cat-file" "blob" - (concat ":3:" file))))) + (insert (magit-git-output `("cat-file" "blob" ,(concat ":3:" file)))))) ;; We have now created the 3 buffer with ours, theirs and the ancestor files (with-current-buffer (ediff-merge-buffers-with-ancestor our-buffer their-buffer base-buffer) (make-local-variable 'magit-ediff-file)