diff options
Diffstat (limited to 'src/vcs/git.rs')
| -rw-r--r-- | src/vcs/git.rs | 1 |
1 files changed, 1 insertions, 0 deletions
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); |