git.el: Use git-add-file for unmerged files, remove git-resolve-file
authorMartin Nordholts <enselic@gmail.com>
Thu, 3 Sep 2009 20:27:24 +0000 (22:27 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Sep 2009 19:11:44 +0000 (12:11 -0700)
commitaaa68dd...0f7b4226fdfdfbbe8bbb2dfd9a9e6d66
tree361f80e...3ddebdcd48febb2d6121e552305a5a08copy hash to clipboard (tree)
parent3de8ba0...1718e80ef1bbf8a5a541beec86930f4ccopy hash to clipboard (diff)
contrib/emacs/git.el