tree ec46d292ece6c4fa1a6d9f943eba2b51841f5d9d
parent 0748494e866041034605aaf177f29a61bdc25951
author Horst H. von Brand <vonbrand@inf.utfsm.cl> 1259707451 -0300
committer Junio C Hamano <gitster@pobox.com> 1259779368 -0800

git-pull.sh: Fix call to git-merge for new command format

Now "git merge <msg> HEAD" is officially deprecated, we should
clean our own use as well.

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>