Merge branch 'jx/blame-align-relative-time' into maint
commit6bf84263b3be507352f2edc9397e4ca6660be289
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:46:34 +0000 (25 11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:46:34 +0000 (25 11:46 -0700)
treed33de1db805066ff3e79789a8648b38711e1956f
parentc122c9a968d5528b799fd5aeab8e67fffb45ef4d
parentdd75553b357d4483d2b58a9e1ac86352f3d2e103
Merge branch 'jx/blame-align-relative-time' into maint

"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