RelNoteson commit git.el: Use git-add-file for unmerged files, remove git-resolve-file (aaa68dd)
   1Documentation/RelNotes-1.6.5.txt