Revert "Use git-merge instead of git-resolve in git-pull."
authorJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 21 Sep 2005 21:01:56 +0000 (14:01 -0700)
commitacfadcf...48e34fdc441e9cffbb385fce9693b363
tree2aaafd0...b4c530754840d6065ea840261fc7c751copy hash to clipboard (tree)
parentb91fb51...cc5c5f316ba149ceedff5ee194f44ebfcopy hash to clipboard (diff)
git-pull.sh