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
..
bin	Fix clippy warnings and explicitely ignore a few, fix future deprecation	2018-12-16 20:50:37 +01:00
fs	Merge pull request #678 from olshevskiy87/display_git_status_conflicted	2020-10-08 22:10:33 +01:00
info	Add pom.xml and zwc filetypes	2020-01-19 09:08:07 -05:00
options	Merge pull request #654 from ariasuni/cleaning	2020-10-08 21:49:20 +01:00
output	Merge pull request #678 from olshevskiy87/display_git_status_conflicted	2020-10-08 22:10:33 +01:00
style	git-feature: display if a file is updated but unmerged (conflicted)	2020-05-29 17:23:22 +03:00
exa.rs	Use git2 instead of parsing .gitignore for --git-ignore	2020-04-19 05:52:35 +02:00