From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:31 +0000 (-0800)
Subject: Merge branch 'ls/p4-translation-failure' into maint
X-Git-Tag: v2.6.3~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c7bdbd6f92bbab2a030ee8bf7957af25327545e5?ds=inline;hp=--cc

Merge branch 'ls/p4-translation-failure' into maint

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

c7bdbd6f92bbab2a030ee8bf7957af25327545e5