PatrickF1 / fzf.fish

🔍🐟 Fzf plugin for Fish
MIT License
2k stars 81 forks source link

[Search git status] support previewing merge conflict #262

Closed PatrickF1 closed 2 years ago

PatrickF1 commented 2 years ago

Without this, merge conflicts mistakenly show up as unstaged changes and as an empty staged changes section. Also, update some comments and docs for Search git status.

Resources https://stackoverflow.com/questions/22792906/how-do-i-produce-every-possible-git-status https://public-inbox.org/git/4AF06B83-E928-4FE2-8094-F23CE3BA1EBC@toyland.org/