t / t5100 / rfc2047-info-0003on commit contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>" (57b74cd)
   1Author: Patrik Fältström
   2Email: paf@nada.kth.se
   3Subject: RFC-HDR care and feeding
   4