Support unmerged paths in status.
Replace git-resolve with git-add.