git-p4: add submit --conflict option and config varaiable
[git] / t / t9700 /
drwxr-xr-x   ..
-rwxr-xr-x 5517 test.pl