tree cc7d91f75286108023859ccde900e82806499881
parent 51bb8adbc9d59ae042eb9134e5218240a1532bea
parent d813ab970db8b57b70bdd1b7e5feddec1c3fd84e
author Junio C Hamano <gitster@pobox.com> 1397680737 -0700
committer Junio C Hamano <gitster@pobox.com> 1397680737 -0700

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