From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Oct 2015 22:43:34 +0000 (-0700)
Subject: Merge branch 'ls/p4-translation-failure'
X-Git-Tag: v2.7.0-rc0~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00272a6339fa65dd6cb9d16e2eb3a0193e4574e6;p=git

Merge branch 'ls/p4-translation-failure'

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
---

00272a6339fa65dd6cb9d16e2eb3a0193e4574e6