![[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) | ||
| commit | 5847c404d38e44628f74d476ed9c04be35ece082 | |
| tree | b90ff88054c71e73007d556dd150a66d333c3613 | tree | snapshot |
| parent | cbe69e29b98c9d733cf934717c42cd085d37af9f | commit | diff |
| parent | 8b130262fb7b5d09df2af63f47d9bff1da220bfb | commit | diff |
Merge branch 'aw/git-p4-deletion' into next
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files