add diff3 format into git