Merge branch 'va/p4' into next
commitd981b2335e7c225b16da386ae726e78923e26af4
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 01:20:20 +0000 (21 17:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 01:20:20 +0000 (21 17:20 -0800)
treefdbfd8dd228c571ba93bf61adeeb907a6d60232e
parent1a7b7d2c4260fea01f570029395d3b4ceffb92a1
parent4fddb41bd77dd0f685d8f79c81d3d40128578fe1
Merge branch 'va/p4' into next

* va/p4:
  git-p4: Add copy detection support
  git-p4: Improve rename detection support
contrib/fast-import/git-p4