Don't include untracked files when in a conflict
Only show conflicting files when cherry picking