author | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Nov 2010 17:42:46 +0000 (10:42 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Nov 2010 17:42:46 +0000 (10:42 -0700) | ||
commit | 3089c2b97a4d73866375a0ba815fc2fa4e2a1c1e | |
tree | de988e8ec082d09e74dcd3d67b542c46577f5a35 | tree | snapshot |
parent | 06cfa8a8589740b9dd4820ad1c2eff4b3d968de7 | commit | diff |
parent | 8b130262fb7b5d09df2af63f47d9bff1da220bfb | commit | diff |
Merge branch 'aw/git-p4-deletion'
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files