summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 15:30:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-22 15:30:12 -0800
commit2b380d81917cb4205a0c13224086fdd9268d5b71 (patch)
tree4d6cfd4e108083330f58f1b11b9f1a994c142add /t/t3310-notes-merge-manual-resolve.sh
parentUpdate draft release notes to 1.7.9 (diff)
parentgitweb: Fix fallback mode of to_utf8 subroutine (diff)
downloadtgif-2b380d81917cb4205a0c13224086fdd9268d5b71.tar.xz
Merge branch 'jn/maint-gitweb-utf8-fix'
* 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 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions