git-pull.sh: Fix call to git-merge for new command format
authorHorst H. von Brand <vonbrand@inf.utfsm.cl>
Tue, 1 Dec 2009 22:44:11 +0000 (19:44 -0300)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Dec 2009 18:42:48 +0000 (10:42 -0800)
commitc0ecb07...48ce2123589a2f077d296e8cf29a9570
treeec46d29...ece6c4fa1a6d9f943eba2b51841f5d9dcopy hash to clipboard (tree)
parent0748494...866041034605aaf177f29a61bdc25951copy hash to clipboard (diff)
git-pull.sh