diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:34 -0700 |
| commit | 00272a6339fa65dd6cb9d16e2eb3a0193e4574e6 (patch) | |
| tree | c290974fc25459d1c79a76e2093ff596ef71b4bf /notes-utils.c | |
| parent | 076c8278583b70547c1c5a65941a661f08210252 (diff) | |
| parent | 1f5f3907117021961545e42097829001b58288db (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
Diffstat (limited to 'notes-utils.c')
0 files changed, 0 insertions, 0 deletions