Setup p4merge git windows - gilitgreatest

Setup p4merge git windows - gilitgreatest