Merge branch 'jx/blame-align-relative-time'
commit84241e70d6ddab262f928507bc7afcb503f4bb88
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:44 +0000 (3 12:06 -0700)
tree7cc4e9e388dbce38a65996641bc4b4b6a8490eb7
parent22e91ba81538010e471855889b3272195c663d94
parentdd75553b357d4483d2b58a9e1ac86352f3d2e103
Merge branch 'jx/blame-align-relative-time'

"git blame" miscounted number of columns needed to show localized
timestamps, resulting in jaggy left-side-edge of the source code
lines in its output.

* jx/blame-align-relative-time:
  blame: dynamic blame_date_width for different locales
  blame: fix broken time_buf paddings in relative timestamp