OSDN Git Service

Merge branch 'cl/p4-use-diff-tree'
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Dec 2013 22:18:20 +0000 (14:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Dec 2013 22:18:20 +0000 (14:18 -0800)
* cl/p4-use-diff-tree:
  git p4: Use git diff-tree instead of format-patch

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge