From 89adea35aeed61836678e083b15f24d637bcb813 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 24 Feb 2018 03:11:34 -0500 Subject: make "conflicted" also show up as modified --- src/vcs/git.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vcs/git.rs b/src/vcs/git.rs index 2eced81..5b351a7 100644 --- a/src/vcs/git.rs +++ b/src/vcs/git.rs @@ -21,6 +21,7 @@ impl GitInfo { modified_statuses.insert(git2::STATUS_WT_MODIFIED); modified_statuses.insert(git2::STATUS_WT_RENAMED); modified_statuses.insert(git2::STATUS_WT_TYPECHANGE); + modified_statuses.insert(git2::STATUS_CONFLICTED); let mut staged_statuses = git2::Status::empty(); staged_statuses.insert(git2::STATUS_INDEX_DELETED); staged_statuses.insert(git2::STATUS_INDEX_MODIFIED); -- cgit v1.2.3-54-g00ecf