Merge branch 'va/p4'
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Feb 2011 05:58:30 +0000 (21:58 -0800)
commit5e3d39ba8aad8508d5514303b369c952fa45237f
treee77dd359183e8106204af8a4595a69b25e0f92a2
parent8d3a3620288734f068b4fa024f5aa3ac2d696fcc
parent4fddb41bd77dd0f685d8f79c81d3d40128578fe1
Merge branch 'va/p4'

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