t / t5100 / emptyon commit git-p4: add submit --conflict option and config varaiable (6bbfd13)
   1