Merge branch 'ls/p4-translation-failure'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Oct 2015 22:43:34 +0000 (15:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Oct 2015 22:43:34 +0000 (15:43 -0700)
Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.

* ls/p4-translation-failure:
  git-p4: handle "Translation of file content failed"
  git-p4: add test case for "Translation of file content failed" error

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge