git-p4: add submit --conflict option and config varaiable