![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 20:46:14 +0000 (12:46 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 20:46:14 +0000 (12:46 -0800) |
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files
Fix handling of git-p4 on deleted files
Trivial merge