git.el: Use git-add-file for unmerged files, remove git-resolve-file