diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:36:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:36:43 -0800 |
| commit | b15840e5b89719521c7b3fae1aa991e0efcb4a22 (patch) | |
| tree | 69b57b6312f5ff90b3dbf35e30c173296aacba3f /builtin/merge-index.c | |
| parent | Merge branch 'maint-1.7.7' into maint (diff) | |
| parent | gitweb: Fix fallback mode of to_utf8 subroutine (diff) | |
| download | tgif-b15840e5b89719521c7b3fae1aa991e0efcb4a22.tar.xz | |
Merge branch 'jn/maint-gitweb-utf8-fix' into maint
* jn/maint-gitweb-utf8-fix:
gitweb: Fix fallback mode of to_utf8 subroutine
gitweb: Output valid utf8 in git_blame_common('data')
gitweb: esc_html() site name for title in OPML
gitweb: Call to_utf8() on input string in chop_and_escape_str()
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions