git-p4: add submit --conflict option and config varaiable
[git] / t / t9601 /
drwxr-xr-x   ..
drwxr-xr-x - cvsroot