Update SHA1 value for p4merge.

SHA1 Value changed.
Merge pull request #2865 from desimone/patch-6

Update SHA1 value for p4merge.