Merge branch 'cl/p4-use-diff-tree' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 May 2014 17:01:32 +0000 (10:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 May 2014 17:01:32 +0000 (10:01 -0700)
commitbd513393554217c1f224d1a18cd20529e21055a5
tree3dd06dbf130fc807237a660148f53b8e60ad78cf
parent6eca9c0e878dc1e6c8cab64c16183401e0580ea0
parent749b668c7db563609de3de7595504f2dca8eef7d
Merge branch 'cl/p4-use-diff-tree' into maint

"git p4" dealing with changes in binary files were broken by a
change in 1.9 release.

* cl/p4-use-diff-tree:
  git-p4: format-patch to diff-tree change breaks binary patches
git-p4.py