Merge branch 'lk/more-helpful-status-hints'

Give finer classification to various states of paths in conflicted state and offer advice messages in the "git status" output.