Merge branch 'as/pretty-truncate'

* as/pretty-truncate: pretty.c: format string with truncate respects logOutputEncoding t4205, t6006: add tests that fail with i18n.logOutputEncoding set t4205 (log-pretty-format): use `tformat` rather than `format` t4041, t4205, t6006, t7102: don't hardcode tested encoding value t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

Junio C Hamano committed Jun 16, 2014 at 10:07 UTC 09e13ad5b0f0689418a723289dca7b3c72d538c4

No changes.