Code

Merge branch 'aw/git-p4-deletion' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:14 +0000 (12:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:46:14 +0000 (12:46 -0800)
commit385cc9d8c44eb5be9d57e630129752a72c0a08c8
tree7f88fcd6c73d8391eae97f1f01e6c63e2abcb6a3
parent6cf9bf6cbcfd57606da30710656b248651d3113f
parent8b130262fb7b5d09df2af63f47d9bff1da220bfb
Merge branch 'aw/git-p4-deletion' into maint

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