t / t5100 / rfc2047-info-0004on commit git-pull.sh: Fix call to git-merge for new command format (c0ecb07)
   1Author: Nathaniel Borenstein (םולש ןב ילטפנ)
   2Email: nsb@thumper.bellcore.com
   3Subject: Test of new header generator
   4