summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
commit17e2b114a8f9d66d7c9263755f89cc503c94c38c (patch)
treee2df821155a9f1837cc1c0764b6b6410e8391242 /merge-recursive.c
parentf52237576ab9ab054e8330ce5dc47f2020cbce74 (diff)
parent0866786b80aa921576ab4e7474c91207111f970f (diff)
downloadgit-17e2b114a8f9d66d7c9263755f89cc503c94c38c.tar.gz
Merge branch 'jn/gitweb-highlite-sanitise'
* jn/gitweb-highlite-sanitise: gitweb: Strip non-printable characters from syntax highlighter output
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions