Add `conflicts`.

Susses out conflicting files from `git status` output after a merge
conflict. Formatted for use with `yank`.