aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-21 15:03:38 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-21 15:03:38 -0700
commitba1c08942c9aa50c4fe205c90caa6d8c0cab6636 (patch)
tree3ae3efdad882064e098212161e86b70c2d4e1f5d /contrib/examples/git-resolve.sh
parent08f9c32463bf9e578acb7ac5f77afd36e803c6bc (diff)
parent7560aacd7cc1e89497ad4ed9c09775c817f15d95 (diff)
downloadgit-ba1c08942c9aa50c4fe205c90caa6d8c0cab6636.tar.gz
git-ba1c08942c9aa50c4fe205c90caa6d8c0cab6636.tar.xz
Merge branch 'bb/unicode-10.0' into maint
Update the character width tables. * bb/unicode-10.0: unicode: update the width tables to Unicode 10
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions