Benjamin Sago cba2070924 Merge pull request #678 from olshevskiy87/display_git_status_conflicted ... git-feature: display if a file is updated but unmerged (conflicted)		2020-10-08 22:10:33 +01:00
..
git.rs	Merge pull request #678 from olshevskiy87/display_git_status_conflicted	2020-10-08 22:10:33 +01:00
mod.rs	Use git2 instead of parsing .gitignore for --git-ignore	2020-04-19 05:52:35 +02:00
xattr.rs	Fix Clippy lints	2020-05-24 21:43:55 +02:00