Merge branch 'cl/p4-use-diff-tree'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 May 2014 21:39:29 +0000 (14:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 May 2014 21:39:29 +0000 (14:39 -0700)
Fixes a regression in 1.9.0 with an obviously correct single-liner.

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

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge