t / t5100 / msg0017on commit contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>" (57b74cd)
   1New content here
   2