cmd_unstage: don't mark conflicting files as resolved