Merge branch 'tb/unicode-6.3-zero-width'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2014 20:38:57 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2014 20:38:57 +0000 (13:38 -0700)
commit9fd911a8101bf4d3bff4e2e61a138505eb39eace
treecc7d91f75286108023859ccde900e82806499881
parent51bb8adbc9d59ae042eb9134e5218240a1532bea
parentd813ab970db8b57b70bdd1b7e5feddec1c3fd84e
Merge branch 'tb/unicode-6.3-zero-width'

Teach our display-column-counting logic about decomposed umlauts
and friends.

* tb/unicode-6.3-zero-width:
  utf8.c: partially update to version 6.3
utf8.c