Use git-merge instead of git-resolve in git-pull.
authorJunio C Hamano <junkio@cox.net>
Sat, 17 Sep 2005 06:38:59 +0000 (23:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 01:16:27 +0000 (18:16 -0700)
commitf887564...b72e107bcdee3ba83c91e2bb4ae13ca7
treeeae844a...1f369bf699f35150e6f3808a4180e55ecopy hash to clipboard (tree)
parent27cfe2e...dcbfc4f6c6288ed4eafd077e232c2ab1copy hash to clipboard (diff)
git-pull.sh