OverView：
 Change the git merge to P4merge
BUG：N/A
 Change the git merge to P4merge
Description：