Search git status

Support previewing merge conflicts (#262)

Report files containing merge conflicts as "Unmerged" when previewing to distinguish them from normal changed files. Without this, merge conflicts mistakenly show up as unstaged changes and as an empty staged changes section.

Fix previewing paths with spaces (38896f2)

Previously, paths containing spaces could not be previewed.