branch: elpa/magit
commit b82a4e889de6b23cf16890f3c85532558e9baa88
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-diff-wash-diff: Fix alignment
---
lisp/magit-diff.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index f502f1507a6..0b90655c33a 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -2394,7 +2394,7 @@ keymap is the parent of their keymaps."
((looking-at "^diff --\
\\(?:\\(?1:git\\) \\(?:\\(?2:.+?\\) \\2\\)?\
\\|\\(?:cc\\|combined\\) \\(?3:.+\\)\\)")
- (let ((status (cond ((equal (match-str 1) "git") "modified")
+ (let ((status (cond ((equal (match-str 1) "git") "modified")
((derived-mode-p 'magit-revision-mode) "resolved")
(t "unmerged")))
(orig nil)
