Merge branch 'aw/git-p4-deletion'
commit3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:42:46 +0000 (5 10:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:42:46 +0000 (5 10:42 -0700)
treede988e8ec082d09e74dcd3d67b542c46577f5a35
parent06cfa8a8589740b9dd4820ad1c2eff4b3d968de7
parent8b130262fb7b5d09df2af63f47d9bff1da220bfb
Merge branch 'aw/git-p4-deletion'

* aw/git-p4-deletion:
  Fix handling of git-p4 on deleted files