From: Junio C Hamano Date: Wed, 16 Apr 2014 20:38:57 +0000 (-0700) Subject: Merge branch 'tb/unicode-6.3-zero-width' X-Git-Tag: v2.0.0-rc0~7 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9fd911a8101bf4d3bff4e2e61a138505eb39eace?ds=inline;hp=--cc 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 --- 9fd911a8101bf4d3bff4e2e61a138505eb39eace