branch: externals/diff-hl
commit 176f931a9bfc6bc6fc5360c6ed7128ff96b21289
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: Dmitry Gutov <dgu...@yandex.ru>
Support buffers in 'conflict' state as well
---
diff-hl.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff-hl.el b/diff-hl.el
index 2dcff96..94b9f73 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -246,7 +246,7 @@ the end position as its only argument."
,body))
(defun diff-hl-modified-p (state)
- (or (eq state 'edited)
+ (or (memq state '(edited conflict))
(and (eq state 'up-to-date)
;; VC state is stale in after-revert-hook.
(or revert-buffer-in-progress-p
