Can I mark a file for resolution without adding it to the stange with one command?

Question

When I git stash pop or do other things that create conflicts, git status shows this:

Unmerged