![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Oct 2010 22:09:00 +0000 (15:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Oct 2010 22:09:00 +0000 (15:09 -0700) |
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files
Fix handling of git-p4 on deleted files
Trivial merge