projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 076c827 1f5f390)
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)
commit00272a6339fa65dd6cb9d16e2eb3a0193e4574e6
treec290974fc25459d1c79a76e2093ff596ef71b4bftree | snapshot
parent076c8278583b70547c1c5a65941a661f08210252commit | diff
parent1f5f3907117021961545e42097829001b58288dbcommit | diff
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
git-p4.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.