diff options
| author | Jesse Luehrs <doy@tozt.net> | 2018-02-24 03:11:34 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2018-02-24 03:11:34 -0500 |
| commit | 89adea35aeed61836678e083b15f24d637bcb813 (patch) | |
| tree | 90d20300505c0b7599e03fc8889cf708a003158e | |
| parent | 8789f34bee03da2857b7ee1777fcc2442645e436 (diff) | |
| download | fancy-prompt-89adea35aeed61836678e083b15f24d637bcb813.tar.gz fancy-prompt-89adea35aeed61836678e083b15f24d637bcb813.zip | |
make "conflicted" also show up as modified
| -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); |