kowainik / hit-on

:octocat: Kowainik Git Workflow Helper Tool
https://kowainik.github.io/projects/hit-on
Mozilla Public License 2.0
76 stars 13 forks source link

[#84] Show conflict files in 'hit status' #87

Closed chshersh closed 5 years ago

chshersh commented 5 years ago

Resolves #84

Output looks like this:

Screenshot from 2019-07-27 19-45-27