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

"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 Jan 17, 2017 at 15:11 UTC aa83f7a2a4a677e9eca4a599f47e027ad06716d1

No changes.