Starship config

I hope adding this git_state will be useful to user that uses git. when you are merging and failed to merge (because of files conflicts), it is important to display this information for the user to take action.

This MR, is contains 2 changes :

• adding the git_status :

~ is a conflict

+ is changed files

- is deleted files

? is untracked files

• adding the git_state, I have change the wording in order to be more concise (MERGING changed to merge).

I hope this help to other users

mentioned in commit f5786cb3

merged