Merge branch 'ls/p4-path-encoding'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2017 22:45:12 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2017 22:45:12 +0000 (14:45 -0800)
When "git p4" imports changelist that removes paths, it failed to
convert pathnames when the p4 used encoding different from the one
used on the Git side.  This has been corrected.

* ls/p4-path-encoding:
  git-p4: fix git-p4.pathEncoding for removed files

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge