Merge branch 'ld/p4-compare-dir-vs-symlink'

"git p4" misbehaved when swapping a directory and a symbolic link. * ld/p4-compare-dir-vs-symlink: git-p4: avoid crash adding symlinked directory

Junio C Hamano committed Dec 27, 2016 at 00:11 UTC f723df581075ae70252a93ba91dcd017f338236e

No changes.