OSDN Git Service

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)
"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

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge