diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:32 -0800 |
| commit | c7bdbd6f92bbab2a030ee8bf7957af25327545e5 (patch) | |
| tree | 3a3e45b681453411dd07524eac3fd28596e47759 /object.c | |
| parent | c04b3a2dbff67605078139f97d4546716e4a1f40 (diff) | |
| parent | 1f5f3907117021961545e42097829001b58288db (diff) | |
| download | git-c7bdbd6f92bbab2a030ee8bf7957af25327545e5.tar.gz git-c7bdbd6f92bbab2a030ee8bf7957af25327545e5.tar.xz | |
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
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions